Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions

Added new Images for programs/index (+ other things)

Browse Source
This commit is contained in:
Mike Schwörer 2014-06-03 14:24:37 +02:00
parent 1b23097722
commit df2d966eb4
8 changed files with 208 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
.idea/workspace.xml generated
View File

@ -63,10 +63,10 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="styles.css" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/css/styles.css"> <entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="128" column="28" selection-start="2355" selection-end="2355" vertical-scroll-proportion="0.8003356" vertical-offset="1699" max-vertical-offset="2295"> <state line="147" column="1" selection-start="2730" selection-end="2730" vertical-scroll-proportion="0.0" vertical-offset="1547" max-vertical-offset="2601">
<folding> <folding>
<element signature="e#692#943#2" expanded="true" /> <element signature="e#692#943#2" expanded="true" />
</folding> </folding>
@ -77,37 +77,36 @@
<file leaf-file-name="thumbnailPreview.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="thumbnailPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="9" column="138" selection-start="399" selection-end="399" vertical-scroll-proportion="-5.8846154" vertical-offset="0" max-vertical-offset="1377"> <state line="68" column="76" selection-start="1907" selection-end="1907" vertical-scroll-proportion="-15.038462" vertical-offset="765" max-vertical-offset="1377">
<folding> <folding>
<element signature="n#style#0;n#img#0;n#a#0;n#div#0;n#div#0;n#div#0;n#li#0;n#!!top" expanded="true" /> <marker date="1401797451476" expanded="true" signature="442:828" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="442:828" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="442:617" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="442:617" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="870:918" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="870:918" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="927:1047" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="927:1047" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1083:1285" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1083:1285" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1083:1211" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1083:1211" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1332:1781" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1332:1781" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1362:1573" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1362:1573" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1611:1781" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1611:1781" placeholder="..." /> <marker date="1401797451476" expanded="true" signature="1636:1722" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1636:1722" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="index.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="8" column="35" selection-start="161" selection-end="161" vertical-scroll-proportion="8.5" vertical-offset="357" max-vertical-offset="1615"> <state line="62" column="71" selection-start="1559" selection-end="1559" vertical-scroll-proportion="0.8041237" vertical-offset="586" max-vertical-offset="1666">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ProgramHelper.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Program.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php"> <entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="29" column="37" selection-start="812" selection-end="812" vertical-scroll-proportion="-15.961538" vertical-offset="78" max-vertical-offset="1445"> <state line="121" column="69" selection-start="4174" selection-end="4174" vertical-scroll-proportion="21.26923" vertical-offset="2610" max-vertical-offset="3179">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -116,25 +115,16 @@
<file leaf-file-name="ProgramsController.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="ProgramsController.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="148" column="29" selection-start="3630" selection-end="3630" vertical-scroll-proportion="0.0" vertical-offset="2205" max-vertical-offset="3723"> <state line="96" column="37" selection-start="2273" selection-end="2273" vertical-scroll-proportion="58.03846" vertical-offset="3141" max-vertical-offset="3723">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TbHtml.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="ProgramHelper.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="3408" column="27" selection-start="134698" selection-end="134698" vertical-scroll-proportion="0.0" vertical-offset="57936" max-vertical-offset="74137"> <state line="90" column="82" selection-start="1955" selection-end="1955" vertical-scroll-proportion="-15.192307" vertical-offset="1135" max-vertical-offset="1717">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SeededRandom.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="45" selection-start="571" selection-end="571" vertical-scroll-proportion="0.0" vertical-offset="595" max-vertical-offset="850">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -143,7 +133,7 @@
<file leaf-file-name="ThumbnailPreview.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="ThumbnailPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="5" column="26" selection-start="114" selection-end="114" vertical-scroll-proportion="0.0" vertical-offset="85" max-vertical-offset="459"> <state line="18" column="0" selection-start="414" selection-end="414" vertical-scroll-proportion="-11.769231" vertical-offset="0" max-vertical-offset="493">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -187,7 +177,6 @@
<option value="$PROJECT_DIR$/www/protected/views/programs/update.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/about.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_search.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/_search.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_view.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/_view.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" />
@ -198,12 +187,13 @@
<option value="$PROJECT_DIR$/www/index.php" /> <option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/dev.php" /> <option value="$PROJECT_DIR$/www/protected/config/env/dev.php" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" /> <option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" /> <option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" /> <option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" /> <option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
</list> </list>
</option> </option>
</component> </component>
@ -589,6 +579,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
@ -730,20 +734,20 @@
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32767764" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21818182" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32767764" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32661718" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21818182" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32837406" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@ -772,11 +776,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
<provider selected="true" editor-type-id="text-editor">
<state line="708" column="0" selection-start="24111" selection-end="24111" vertical-scroll-proportion="0.0" vertical-offset="12036" max-vertical-offset="16932" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php"> <entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1987" column="27" selection-start="82594" selection-end="82594" vertical-scroll-proportion="-4.076923" vertical-offset="33554" max-vertical-offset="44438" /> <state line="1987" column="27" selection-start="82594" selection-end="82594" vertical-scroll-proportion="-4.076923" vertical-offset="33554" max-vertical-offset="44438" />
@ -839,7 +838,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/web/CController.php"> <entry file="file://$PROJECT_DIR$/framework/web/CController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-0.2155797" vertical-offset="13209" max-vertical-offset="20910" /> <state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-0.2155797" vertical-offset="13209" max-vertical-offset="20910">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/demos/default/protected/controllers/SiteController.php"> <entry file="file://$PROJECT_DIR$/demos/default/protected/controllers/SiteController.php">
@ -874,7 +875,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/logging/CLogger.php"> <entry file="file://$PROJECT_DIR$/framework/logging/CLogger.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="230" column="65" selection-start="7640" selection-end="7640" vertical-scroll-proportion="-7.3076925" vertical-offset="3601" max-vertical-offset="6001" /> <state line="230" column="65" selection-start="7640" selection-end="7640" vertical-scroll-proportion="-7.3076925" vertical-offset="3601" max-vertical-offset="6001">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/create.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/create.php">
@ -939,7 +942,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/index-test.php"> <entry file="file://$PROJECT_DIR$/www/index-test.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="606" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="606">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/error.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/error.php">
@ -959,7 +964,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/index.php"> <entry file="file://$PROJECT_DIR$/www/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="9" column="58" selection-start="368" selection-end="371" vertical-scroll-proportion="-5.8846154" vertical-offset="0" max-vertical-offset="323" /> <state line="9" column="58" selection-start="368" selection-end="371" vertical-scroll-proportion="-5.8846154" vertical-offset="0" max-vertical-offset="323">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php"> <entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
@ -979,13 +986,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="26" selection-start="114" selection-end="114" vertical-scroll-proportion="0.0" vertical-offset="85" max-vertical-offset="459">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="3408" column="27" selection-start="134698" selection-end="134698" vertical-scroll-proportion="0.0" vertical-offset="57936" max-vertical-offset="74137"> <state line="3408" column="27" selection-start="134698" selection-end="134698" vertical-scroll-proportion="0.0" vertical-offset="57936" max-vertical-offset="74137">
@ -993,70 +993,82 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/yiilite.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3785" column="20" selection-start="112143" selection-end="112143" vertical-scroll-proportion="0.34736842" vertical-offset="63807" max-vertical-offset="176647" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="33" column="44" selection-start="624" selection-end="624" vertical-scroll-proportion="0.24185249" vertical-offset="420" max-vertical-offset="1921" /> <state line="33" column="44" selection-start="624" selection-end="624" vertical-scroll-proportion="0.24185249" vertical-offset="420" max-vertical-offset="1921">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/db/ar/CActiveRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1465" column="20" selection-start="52155" selection-end="52155" vertical-scroll-proportion="0.33333334" vertical-offset="24596" max-vertical-offset="41395">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="148" column="29" selection-start="3630" selection-end="3630" vertical-scroll-proportion="0.0" vertical-offset="2205" max-vertical-offset="3723"> <state line="96" column="37" selection-start="2273" selection-end="2273" vertical-scroll-proportion="58.03846" vertical-offset="3141" max-vertical-offset="3723">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="90" column="82" selection-start="1955" selection-end="1955" vertical-scroll-proportion="-15.192307" vertical-offset="1135" max-vertical-offset="1717">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="147" column="1" selection-start="2730" selection-end="2730" vertical-scroll-proportion="0.0" vertical-offset="1547" max-vertical-offset="2601">
<folding>
<element signature="e#692#943#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="68" column="76" selection-start="1907" selection-end="1907" vertical-scroll-proportion="-15.038462" vertical-offset="765" max-vertical-offset="1377">
<folding>
<marker date="1401797451476" expanded="true" signature="442:828" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="442:617" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="870:918" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="927:1047" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1083:1285" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1083:1211" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1332:1781" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1362:1573" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1611:1781" placeholder="..." />
<marker date="1401797451476" expanded="true" signature="1636:1722" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="0" selection-start="414" selection-end="414" vertical-scroll-proportion="-11.769231" vertical-offset="0" max-vertical-offset="493">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php"> <entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="26" column="6" selection-start="747" selection-end="747" vertical-scroll-proportion="-0.20877193" vertical-offset="561" max-vertical-offset="2618" /> <state line="121" column="69" selection-start="4174" selection-end="4174" vertical-scroll-proportion="21.26923" vertical-offset="2610" max-vertical-offset="3179">
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="29" column="37" selection-start="812" selection-end="812" vertical-scroll-proportion="-15.961538" vertical-offset="78" max-vertical-offset="1445">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="8" column="35" selection-start="161" selection-end="161" vertical-scroll-proportion="8.5" vertical-offset="357" max-vertical-offset="1615"> <state line="62" column="71" selection-start="1559" selection-end="1559" vertical-scroll-proportion="0.8041237" vertical-offset="586" max-vertical-offset="1666">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="138" selection-start="399" selection-end="399" vertical-scroll-proportion="-5.8846154" vertical-offset="0" max-vertical-offset="1377">
<folding>
<element signature="n#style#0;n#img#0;n#a#0;n#div#0;n#div#0;n#div#0;n#li#0;n#!!top" expanded="true" />
<marker date="1401778789519" expanded="true" signature="442:828" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="442:617" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="870:918" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="927:1047" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1083:1285" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1083:1211" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1332:1781" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1362:1573" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1611:1781" placeholder="..." />
<marker date="1401778789519" expanded="true" signature="1636:1722" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="128" column="28" selection-start="2355" selection-end="2355" vertical-scroll-proportion="0.8003356" vertical-offset="1699" max-vertical-offset="2295">
<folding>
<element signature="e#692#943#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

2
DB_Changes.txt
View File

@ -1,5 +1,7 @@
othervalues -> Added Column SValue othervalues -> Added Column SValue
othervalues -> Added Key "AdminPassword" othervalues -> Added Key "AdminPassword"
programme -> Added Column ThumbnailName programme -> Added Column ThumbnailName
programme -> Added Column programming_lang
programme -> Changed Sieb_des_Erasthothenes -> Sieb des Erasthothenes (also ren Imagefiles) programme -> Changed Sieb_des_Erasthothenes -> Sieb des Erasthothenes (also ren Imagefiles)
programme -> Adjusted Star Ratings programme -> Adjusted Star Ratings
programme -> Niripsa[visible] = 0

22
www/css/styles.css
View File

@ -112,8 +112,17 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
.thumbnailInnerHead { .thumbnailInnerHead {
padding: 4px; padding: 4px;
height: 225px; height: 204px;
overflow-y: hidden; line-height: 204px;
background-color: #ECF0F1;
}
.thumbnailInnerImage {
width: 100%;
border-radius: 3px;
vertical-align: middle;
} }
.thumbnailInnerFooter { .thumbnailInnerFooter {
@ -128,3 +137,12 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
opacity: 0.75; opacity: 0.75;
filter: alpha(opacity=75); /* msie */ filter: alpha(opacity=75); /* msie */
} }
.thumbnailParentSpan .caption h1,
.thumbnailParentSpan .caption h2,
.thumbnailParentSpan .caption h3,
.thumbnailParentSpan .caption h4,
.thumbnailParentSpan .caption h5,
.thumbnailParentSpan .caption h6 {
text-align: center;
}

20
www/protected/components/ProgramHelper.php
View File

@ -1,7 +1,14 @@
<?php <?php
/**
* Class ProgramHelper
*/
class ProgramHelper { class ProgramHelper {
/**
* @param bool $doDelimiter
* @return Program[]
*/
public static function GetHighlightedProgList($doDelimiter) public static function GetHighlightedProgList($doDelimiter)
{ {
$dropDownModels = array(); $dropDownModels = array();
@ -26,7 +33,7 @@ class ProgramHelper {
foreach (Program::model()->findAll($criteria) as $row) { foreach (Program::model()->findAll($criteria) as $row) {
$contains = false; $contains = false;
foreach($dropDownModels as $modelElem) foreach($dropDownModels as $modelElem)
if ($modelElem != null && $modelElem->attributes['ID'] == $row->attributes['ID']) if ($modelElem != null && $modelElem->ID == $row->ID)
$contains = true; $contains = true;
if (! $contains) if (! $contains)
$dropDownModels[] = $row; $dropDownModels[] = $row;
@ -35,6 +42,9 @@ class ProgramHelper {
return $dropDownModels; return $dropDownModels;
} }
/**
* @return Program
*/
public static function GetRecentProg() public static function GetRecentProg()
{ {
$criteria = new CDbCriteria; $criteria = new CDbCriteria;
@ -45,6 +55,9 @@ class ProgramHelper {
return Program::model()->find($criteria); return Program::model()->find($criteria);
} }
/**
* @return Program
*/
public static function GetDailyProg() public static function GetDailyProg()
{ {
$recent = self::GetRecentProg(); $recent = self::GetRecentProg();
@ -62,6 +75,9 @@ class ProgramHelper {
return $result; return $result;
} }
/**
* @return array
*/
public static function GetProgDropDownList() public static function GetProgDropDownList()
{ {
$progDropDown = array(); $progDropDown = array();
@ -72,7 +88,7 @@ class ProgramHelper {
if (is_null($row)) if (is_null($row))
$progDropDown[] = TbHtml::menuDivider(); $progDropDown[] = TbHtml::menuDivider();
else else
$progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programs/view/' . $row->attributes['Name']); $progDropDown[] = array('label' => $row->Name, 'url' => $row->getLink());
} }
return $progDropDown; return $progDropDown;
} }

2
www/protected/components/ThumbnailPreview.php
View File

@ -11,10 +11,12 @@ class ThumbnailPreview extends CWidget {
public $downloads = 0; public $downloads = 0;
public $date = null; public $date = null;
public $image = ''; public $image = '';
public $programminglang = '???';
public function run() { public function run() {
if ($this->date == null) if ($this->date == null)
$this->date = new DateTime('2000-01-01'); $this->date = new DateTime('2000-01-01');
$this->render('thumbnailPreview'); $this->render('thumbnailPreview');
} }
} }

6
www/protected/components/views/thumbnailPreview.php
View File

@ -7,7 +7,7 @@
<div class="thumbnail <?php if (! $this->enabled) print("thumbnailDisabled"); ?>"> <div class="thumbnail <?php if (! $this->enabled) print("thumbnailDisabled"); ?>">
<div class="thumbnailInnerHead"> <div class="thumbnailInnerHead">
<a <?php if($this->enabled) echo 'href="'. $this->link . '"'; ?>> <a <?php if($this->enabled) echo 'href="'. $this->link . '"'; ?>>
<img style="width: 100%" <?php if (! $this->enabled) print('class="grayscale"'); ?> src="<?php echo $this->image; ?>"> <img class="thumbnailInnerImage <?php if (! $this->enabled) print('grayscale'); ?>" src="<?php echo $this->image; ?>">
</a> </a>
</div> </div>
<div class="caption"> <div class="caption">
@ -66,8 +66,8 @@
<div class="span4"><b><?php echo $this->date->format('d.m.y'); ?></b><br/> <div class="span4"><b><?php echo $this->date->format('d.m.y'); ?></b><br/>
<small>Added On</small> <small>Added On</small>
</div> </div>
<div class="span4"><b><?php echo $this->starcount . '/4'; ?></b><br/> <div class="span4"><b><?php echo $this->programminglang; ?></b><br/>
<small>Rating</small> <small>Language</small>
</div> </div>
</div> </div>
</div> </div>

37
www/protected/models/Program.php
View File

@ -13,6 +13,7 @@
* @property integer $enabled * @property integer $enabled
* @property integer $visible * @property integer $visible
* @property string $Language * @property string $Language
* @property string $programming_lang
* @property string $Description * @property string $Description
* @property string $add_date * @property string $add_date
* @property string $download_url * @property string $download_url
@ -42,13 +43,14 @@ class Program extends CActiveRecord
// NOTE: you should only define rules for those attributes that // NOTE: you should only define rules for those attributes that
// will receive user inputs. // will receive user inputs.
return array( return array(
array('Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, Description, add_date, download_url, viewable_code, sourceforge_url, homepage_url, github_url, uses_absCanv, update_identifier', 'required'), array('Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, programming_lang, Description, add_date, download_url, viewable_code, sourceforge_url, homepage_url, github_url, uses_absCanv, update_identifier', 'required'),
array('enabled, visible, viewable_code, uses_absCanv, highscore_gid', 'numerical', 'integerOnly'=>true), array('enabled, visible, viewable_code, uses_absCanv, highscore_gid', 'numerical', 'integerOnly'=>true),
array('Downloads, Sterne', 'numerical'), array('Downloads, Sterne', 'numerical'),
array('update_identifier', 'length', 'max'=>28), array('update_identifier', 'length', 'max'=>28),
array('programming_lang', 'length', 'max'=>16),
// The following rule is used by search(). // The following rule is used by search().
// @todo Please remove those attributes that should not be searched. // @todo Please remove those attributes that should not be searched.
array('ID, Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, Description, add_date, download_url, viewable_code, sourceforge_url, homepage_url, github_url, uses_absCanv, update_identifier, highscore_gid', 'safe', 'on'=>'search'), array('ID, Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, programming_lang, Description, add_date, download_url, viewable_code, sourceforge_url, homepage_url, github_url, uses_absCanv, update_identifier, highscore_gid', 'safe', 'on'=>'search'),
); );
} }
@ -78,6 +80,7 @@ class Program extends CActiveRecord
'enabled' => 'Enabled', 'enabled' => 'Enabled',
'visible' => 'Visible', 'visible' => 'Visible',
'Language' => 'Language', 'Language' => 'Language',
'programming_lang' => 'programming_lang',
'Description' => 'Description', 'Description' => 'Description',
'add_date' => 'Add Date', 'add_date' => 'Add Date',
'download_url' => 'Download Url', 'download_url' => 'Download Url',
@ -116,6 +119,7 @@ class Program extends CActiveRecord
$criteria->compare('enabled',$this->enabled); $criteria->compare('enabled',$this->enabled);
$criteria->compare('visible',$this->visible); $criteria->compare('visible',$this->visible);
$criteria->compare('Language',$this->Language,true); $criteria->compare('Language',$this->Language,true);
$criteria->compare('programming_lang',$this->programming_lang,true);
$criteria->compare('Description',$this->Description,true); $criteria->compare('Description',$this->Description,true);
$criteria->compare('add_date',$this->add_date,true); $criteria->compare('add_date',$this->add_date,true);
$criteria->compare('download_url',$this->download_url,true); $criteria->compare('download_url',$this->download_url,true);
@ -145,4 +149,33 @@ class Program extends CActiveRecord
{ {
return parent::model($className); return parent::model($className);
} }
//####################################
//########### MY FUNCTIONS ###########
//####################################
/**
* @return string
*/
public function getImagePath() {
if (file_exists('images/programs/thumbnails/' . $this->Name . '.png'))
return '/images/programs/thumbnails/' . $this->Name . '.png';
else if (file_exists('images/programs/thumbnails/' . $this->Name . '.jpg'))
return '/images/programs/thumbnails/' . $this->Name . '.jpg'; //TODO REM ME - never use jpg
else throw new CHttpException(500, "Could not find Program Thumbnail '" . $this->Name . "'");
}
/**
* @return string
*/
public function getLink() {
return '/programs/view/' . $this->Name;
}
/**
* @return string[]
*/
public function getLanguageList() {
return explode("|", $this->Language);
}
} }

25
www/protected/views/programs/index.php
View File

@ -31,7 +31,7 @@
<?php <?php
$criteria = new CDbCriteria; $criteria = new CDbCriteria;
$criteria->order = "add_date DESC"; $criteria->order = "Sterne DESC, add_date DESC";
$criteria->condition = "visible=1"; $criteria->condition = "visible=1";
$all = Program::model()->findAll($criteria); $all = Program::model()->findAll($criteria);
@ -46,18 +46,21 @@
echo '<ul class="thumbnails">'; echo '<ul class="thumbnails">';
foreach (array_slice($all, $i * PROGS_INDEX_ROWSIZE, PROGS_INDEX_ROWSIZE) as $record) { foreach (array_slice($all, $i * PROGS_INDEX_ROWSIZE, PROGS_INDEX_ROWSIZE) as $record) {
/* @var $record Program */
$this->widget('ThumbnailPreview', $this->widget('ThumbnailPreview',
[ [
'caption' => $record->attributes['Thumbnailname'], 'caption' => $record->Thumbnailname,
'link' => '/programs/view/' . $record->attributes['Name'], 'link' => $record->getLink(),
'description' => $record->attributes['Description'], 'description' => $record->Description,
'category' => $record->attributes['Kategorie'], 'category' => $record->Kategorie,
'language' => explode("|", $record->attributes['Language']), 'language' => $record->getLanguageList(),
'image' => '/images/programs/thumbnails/' . $record->attributes['Name'] . '.jpg', 'image' => $record->getImagePath(),
'starcount' => $record->attributes['Sterne'], 'starcount' => $record->Sterne,
'downloads' => $record->attributes['Downloads'], 'downloads' => $record->Downloads,
'date' => new DateTime($record->attributes['add_date']), 'date' => new DateTime($record->add_date),
'enabled' => $record->attributes['enabled'], 'enabled' => $record->enabled,
'programminglang' => $record->programming_lang,
]); ]);
} }