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

Added various things

Browse Source 
Translated Log + Short Prog Desc to Eng
Added Category filter to progs
This commit is contained in:
Mike Schwörer 2014-06-30 22:51:59 +02:00
parent ccf18ad491
commit 6e39aefd52
14 changed files with 328 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

588
.idea/workspace.xml generated
View File

@ -2,13 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
</list>
<ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" />
@ -63,28 +63,55 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="SeededRandom.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="5" selection-start="679" selection-end="679" vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="799">
<state line="69" column="121" selection-start="1642" selection-end="1642" vertical-scroll-proportion="-5.8846154" vertical-offset="1020" max-vertical-offset="2108">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProgramHelper.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<file leaf-file-name="ProgramsController.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="73" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.0" vertical-offset="644" max-vertical-offset="1819">
<state line="187" column="23" selection-start="4726" selection-end="4734" vertical-scroll-proportion="-12.692307" vertical-offset="2849" max-vertical-offset="4369">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="admin.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="34" selection-start="1152" selection-end="1152" vertical-scroll-proportion="0.22895622" vertical-offset="765" max-vertical-offset="2227">
<state line="35" column="51" selection-start="690" selection-end="710" vertical-scroll-proportion="-7.1923075" vertical-offset="408" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ThumbnailProgPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="11" selection-start="227" selection-end="227" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="459">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="thumbnailProgPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="60" selection-start="1022" selection-end="1022" vertical-scroll-proportion="-16.961538" vertical-offset="120" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="styles.css" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="114" column="0" selection-start="2232" selection-end="2232" vertical-scroll-proportion="0.83306056" vertical-offset="1429" max-vertical-offset="9894">
<folding />
</state>
</provider>
@ -103,12 +130,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php" />
<option value="$PROJECT_DIR$/www/protected/models/Log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_form.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/LogController.php" />
<option value="$PROJECT_DIR$/www/egh.php" />
<option value="$PROJECT_DIR$/www/extendedGitGraph.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
@ -116,7 +137,6 @@
<option value="$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php" />
<option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
<option value="$PROJECT_DIR$/www/protected/components/MsHelper.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/create.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/update.php" />
@ -132,14 +152,9 @@
<option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/login.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_search.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/data/programs/.gitignore" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/models/ProgramUpdatesLog.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramUpdatesController.php" />
<option value="$PROJECT_DIR$/www/protected/views/programupdates/index.php" />
<option value="$PROJECT_DIR$/www/protected/models/ProgramUpdates.php" />
@ -147,13 +162,25 @@
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
<option value="$PROJECT_DIR$/www/protected/components/MSController.php" />
<option value="$PROJECT_DIR$/www/protected/views/api/update.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/APIController.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_form.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/api/captcha.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/APIController.php" />
<option value="$PROJECT_DIR$/www/protected/views/programupdates/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/admin.php" />
<option value="$PROJECT_DIR$/www/protected/models/Log.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.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/widgets/views/thumbnailProgPreview.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
</list>
</option>
</component>
@ -300,146 +327,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="programupdates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="msmain" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="models" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controllers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="config" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
@ -484,7 +371,37 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="extendedGitGraph" />
<option name="myItemId" value="widgets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="widgets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -669,16 +586,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="55" y="-8" width="1873" height="1096" extended-state="6" />
<editor active="false" />
<frame x="55" y="-8" width="1873" height="1096" extended-state="0" />
<editor active="true" />
<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="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.3244963" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3244963" sideWeight="0.4997245" order="6" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26225895" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2677686" 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.3952282" sideWeight="0.4997245" 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="false" weight="0.3244963" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
@ -719,61 +636,11 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/create.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="35" selection-start="114" selection-end="114" vertical-scroll-proportion="0.2034188" vertical-offset="0" max-vertical-offset="585" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/update.php">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="43" selection-start="236" selection-end="236" vertical-scroll-proportion="0.31965813" vertical-offset="0" max-vertical-offset="585" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/base/interfaces.php">
<provider selected="true" editor-type-id="text-editor">
<state line="246" column="10" selection-start="7911" selection-end="7911" vertical-scroll-proportion="0.34700856" vertical-offset="3860" max-vertical-offset="10710" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/auth/CBaseUserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="67" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.72649574" vertical-offset="0" max-vertical-offset="2210" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/auth/CUserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="38" selection-start="899" selection-end="899" vertical-scroll-proportion="0.5521368" vertical-offset="0" max-vertical-offset="1360" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/login.php">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="16" selection-start="396" selection-end="396" vertical-scroll-proportion="0.30940172" vertical-offset="159" max-vertical-offset="1071" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="33" selection-start="211" selection-end="211" vertical-scroll-proportion="0.14358975" vertical-offset="35" max-vertical-offset="646" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="12" selection-start="1189" selection-end="1189" vertical-scroll-proportion="1.1333333" vertical-offset="0" max-vertical-offset="1564" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_search.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="112" selection-start="1524" selection-end="1524" vertical-scroll-proportion="0.6683761" vertical-offset="204" max-vertical-offset="1037" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="105" selection-start="1765" selection-end="1765" vertical-scroll-proportion="0.5811966" vertical-offset="357" max-vertical-offset="1190" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="0" selection-start="441" selection-end="441" vertical-scroll-proportion="0.43589744" vertical-offset="0" max-vertical-offset="585" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
<provider selected="true" editor-type-id="text-editor">
<state line="84" column="15" selection-start="4900" selection-end="4900" vertical-scroll-proportion="0.95726496" vertical-offset="749" max-vertical-offset="16813">
@ -796,23 +663,9 @@
<state line="33" column="20" selection-start="871" selection-end="871" vertical-scroll-proportion="0.6957265" vertical-offset="35" max-vertical-offset="646" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="11" selection-start="227" selection-end="227" vertical-scroll-proportion="0.30141845" vertical-offset="0" max-vertical-offset="564" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="155" column="27" selection-start="5273" selection-end="5273" vertical-scroll-proportion="-7.5" vertical-offset="2321" max-vertical-offset="44438">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3542" column="23" selection-start="140056" selection-end="140056" vertical-scroll-proportion="0.53675216" vertical-offset="59781" max-vertical-offset="74018">
<folding />
</state>
<state line="155" column="27" selection-start="5273" selection-end="5273" vertical-scroll-proportion="-7.5" vertical-offset="2321" max-vertical-offset="44438" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/data/programs/.gitignore">
@ -830,11 +683,6 @@
<state line="31" column="55" selection-start="626" selection-end="639" vertical-scroll-proportion="0.4051282" vertical-offset="290" max-vertical-offset="901" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="63" column="64" selection-start="1675" selection-end="1675" vertical-scroll-proportion="1.8307692" vertical-offset="0" max-vertical-offset="1394" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.52307695" vertical-offset="306" max-vertical-offset="1003" />
@ -845,16 +693,6 @@
<state line="5" column="46" selection-start="136" selection-end="136" vertical-scroll-proportion="-0.16239317" vertical-offset="180" max-vertical-offset="765" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="6" selection-start="266" selection-end="266" vertical-scroll-proportion="-0.65384614" vertical-offset="221" max-vertical-offset="1292" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programupdates/admin.php">
<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="1054" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramUpdatesController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="6" selection-start="13" selection-end="13" vertical-scroll-proportion="-2.7777777" vertical-offset="1659" max-vertical-offset="2244" />
@ -865,35 +703,14 @@
<state line="55" column="20" selection-start="1966" selection-end="1974" vertical-scroll-proportion="0.37606838" vertical-offset="596" max-vertical-offset="3264" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="79" column="56" selection-start="2112" selection-end="2123" vertical-scroll-proportion="-12.038462" vertical-offset="1030" max-vertical-offset="2703">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/ProgramUpdatesLog.php">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="26" selection-start="164" selection-end="164" vertical-scroll-proportion="-1.6153846" vertical-offset="1047" max-vertical-offset="1836" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="138" column="34" selection-start="4726" selection-end="4830" vertical-scroll-proportion="0.35664335" vertical-offset="2142" max-vertical-offset="3621">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="90" column="62" selection-start="2869" selection-end="2869" vertical-scroll-proportion="0.49475524" vertical-offset="1247" max-vertical-offset="1921">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/LogController.php">
<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="3417" />
<state line="90" column="62" selection-start="2869" selection-end="2869" vertical-scroll-proportion="0.49475524" vertical-offset="1247" max-vertical-offset="1921" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
@ -903,14 +720,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="97" column="64" selection-start="3708" selection-end="3708" vertical-scroll-proportion="2.882867" vertical-offset="0" max-vertical-offset="2210">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/APIController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="21" selection-start="387" selection-end="387" vertical-scroll-proportion="0.14529915" vertical-offset="306" max-vertical-offset="1003" />
<state line="97" column="64" selection-start="3708" selection-end="3708" vertical-scroll-proportion="2.882867" vertical-offset="0" max-vertical-offset="2210" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php">
@ -920,28 +730,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/api/update.php">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="60" selection-start="130" selection-end="130" vertical-scroll-proportion="0.11623932" vertical-offset="0" max-vertical-offset="585" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="79" column="42" selection-start="1895" selection-end="1895" vertical-scroll-proportion="0.8136752" vertical-offset="867" max-vertical-offset="2091" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="230" column="28" selection-start="5785" selection-end="5870" vertical-scroll-proportion="0.33162394" vertical-offset="3716" max-vertical-offset="4301" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/ProgramUpdates.php">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="25" selection-start="154" selection-end="159" vertical-scroll-proportion="0.17264958" vertical-offset="1" max-vertical-offset="1853">
<folding />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/date_c.php">
<provider selected="true" editor-type-id="text-editor">
<state line="329" column="47" selection-start="12475" selection-end="12475" vertical-scroll-proportion="0.2888889" vertical-offset="5424" max-vertical-offset="10948">
@ -954,11 +742,6 @@
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-7.5786715" vertical-offset="4335" max-vertical-offset="8483" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="15" selection-start="90" selection-end="90" vertical-scroll-proportion="0.111292966" vertical-offset="0" max-vertical-offset="9690" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programupdates/view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="81" selection-start="1167" selection-end="1204" vertical-scroll-proportion="0.28671327" vertical-offset="516" max-vertical-offset="1224" />
@ -974,6 +757,60 @@
<state line="947" column="9" selection-start="29352" selection-end="29352" vertical-scroll-proportion="-6.9615383" vertical-offset="15918" max-vertical-offset="18003" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="47" column="6" selection-start="795" selection-end="795" vertical-scroll-proportion="0.93436295" vertical-offset="315" max-vertical-offset="901" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/db/ar/CActiveRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="21" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.3428246" vertical-offset="5" max-vertical-offset="41395">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="16" selection-start="725" selection-end="725" vertical-scroll-proportion="0.43883276" vertical-offset="0" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/_view.php">
<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="917">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/LogController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="31.384615" vertical-offset="816" max-vertical-offset="3417">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/APIController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="5" selection-start="940" selection-end="940" vertical-scroll-proportion="-29.692308" vertical-offset="112" max-vertical-offset="1003">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="59" selection-start="66" selection-end="66" vertical-scroll-proportion="0.03815937" vertical-offset="0" max-vertical-offset="891">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="34" selection-start="1152" selection-end="1152" vertical-scroll-proportion="0.22895622" vertical-offset="765" max-vertical-offset="2227">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="73" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.0" vertical-offset="644" max-vertical-offset="1819">
@ -983,19 +820,138 @@
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="5" selection-start="679" selection-end="679" vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="799">
<state line="40" column="5" selection-start="679" selection-end="679" vertical-scroll-proportion="0.667789" vertical-offset="0" max-vertical-offset="891">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<entry file="file://$PROJECT_DIR$/www/protected/views/api/update.php">
<provider selected="true" editor-type-id="text-editor">
<state line="47" column="6" selection-start="795" selection-end="795" vertical-scroll-proportion="0.93436295" vertical-offset="315" max-vertical-offset="901" />
<state line="0" column="0" selection-start="0" selection-end="130" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="170">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<entry file="file://$PROJECT_DIR$/www/protected/models/ProgramUpdates.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="34" selection-start="1152" selection-end="1152" vertical-scroll-proportion="0.22895622" vertical-offset="765" max-vertical-offset="2227">
<state line="6" column="25" selection-start="154" selection-end="159" vertical-scroll-proportion="-3.8846154" vertical-offset="1" max-vertical-offset="1853">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programupdates/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="47" column="21" selection-start="1257" selection-end="1257" vertical-scroll-proportion="-27.461538" vertical-offset="85" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="49" column="0" selection-start="1224" selection-end="1224" vertical-scroll-proportion="-24.461538" vertical-offset="197" max-vertical-offset="1105">
<folding>
<marker date="1404146035257" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1404146035257" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1404146035257" expanded="false" signature="-1:-1" placeholder="..." />
<marker date="1404146035257" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programupdates/_view.php">
<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="917">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Log.php">
<provider selected="true" editor-type-id="text-editor">
<state line="83" column="49" selection-start="2079" selection-end="2079" vertical-scroll-proportion="0.5039282" vertical-offset="962" max-vertical-offset="2074">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programupdates/_form.php">
<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="917">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="76" selection-start="1634" selection-end="1634" vertical-scroll-proportion="-15.0" vertical-offset="273" max-vertical-offset="1224">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="88" column="55" selection-start="2585" selection-end="2585" vertical-scroll-proportion="-36.384617" vertical-offset="550" max-vertical-offset="3621">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="58" column="26" selection-start="1858" selection-end="1858" vertical-scroll-proportion="0.85470086" vertical-offset="486" max-vertical-offset="2822">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="0" selection-start="440" selection-end="460" vertical-scroll-proportion="0.4068376" vertical-offset="0" max-vertical-offset="585">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3682" column="27" selection-start="146162" selection-end="146162" vertical-scroll-proportion="0.52136755" vertical-offset="62170" max-vertical-offset="74018">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="121" selection-start="1642" selection-end="1642" vertical-scroll-proportion="-5.8846154" vertical-offset="1020" max-vertical-offset="2108">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="187" column="23" selection-start="4726" selection-end="4734" vertical-scroll-proportion="-12.692307" vertical-offset="2849" max-vertical-offset="4369">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="51" selection-start="690" selection-end="710" vertical-scroll-proportion="-7.1923075" vertical-offset="408" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="11" selection-start="227" selection-end="227" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="459">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="60" selection-start="1022" selection-end="1022" vertical-scroll-proportion="-16.961538" vertical-offset="120" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="114" column="0" selection-start="2232" selection-end="2232" vertical-scroll-proportion="0.83306056" vertical-offset="1429" max-vertical-offset="9894">
<folding />
</state>
</provider>

12
www/css/styles.css
View File

@ -106,6 +106,18 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
text-decoration: none;
}
.thumbnail a:active,
.thumbnail a:visited,
.thumbnail a:link {
color: #95A5A6;
text-decoration: none;
}
.thumbnail a:hover {
color: #1ABC9C;
text-decoration: none;
}
.thumbnailParentSpan {
width: 270px;
}

BIN
www/images/log/captcha_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

2
www/protected/components/widgets/views/thumbnailProgPreview.php
View File

@ -32,7 +32,7 @@
<?php
if (!empty($this->category)) {
echo MsHtml::icon(MsHtml::ICON_TAG);
echo $this->category . '';
echo MsHtml::link($this->category . '', '/programs/cat/' . $this->category);
}
?>
</p>

3
www/protected/config/main.php
View File

@ -66,7 +66,8 @@ return ArrayX::merge(
'showScriptName' => false,
'rules' =>
[
'programs/' => 'programs/index',
'programs/' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']],
'programs/cat/<categoryfilter>' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']],
'programs/view/<id>' => 'programs/view',
'log/' => ['log/index', 'defaultParams' => ['logid' => '-1']],

8
www/protected/controllers/ProgramsController.php
View File

@ -144,7 +144,7 @@ class ProgramsController extends MSController
/**
* Lists all models.
*/
public function actionIndex()
public function actionIndex($categoryfilter)
{
$this->layout = '//layouts/main';
@ -156,7 +156,10 @@ class ProgramsController extends MSController
$criteria = new CDbCriteria;
$criteria->order = "Sterne DESC, add_date DESC";
$criteria->condition = "visible=1";
if (! empty($categoryfilter))
$criteria->addCondition("Kategorie = :cat");
$criteria->params[':cat'] = $categoryfilter;
$criteria->addCondition("visible=1");
$all = Program::model()->findAll($criteria);
/* @var $all Program[] */
@ -182,6 +185,7 @@ class ProgramsController extends MSController
$data['pagecount'] = $pagecount;
$data['rowcount'] = $rowcount;
$data['data'] = $progdata;
$data['category'] = $categoryfilter;
$this->render('index', $data);
}

1
www/protected/models/Log.php
View File

@ -81,6 +81,7 @@ class Log extends CActiveRecord
return new CActiveDataProvider($this, array(
'criteria'=>$criteria,
'sort'=>[ 'defaultOrder'=>'date ASC' ],
));
}

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

@ -44,7 +44,7 @@ class Program extends CActiveRecord
// NOTE: you should only define rules for those attributes that
// will receive user inputs.
return array(
array('Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, programming_lang, Description, add_date, download_url, 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, uses_absCanv', 'required'),
array('enabled, visible, uses_absCanv, highscore_gid', 'numerical', 'integerOnly'=>true),
array('Downloads, Sterne', 'numerical'),
array('update_identifier', 'length', 'max'=>64),
@ -86,7 +86,7 @@ class Program extends CActiveRecord
'enabled' => 'Enabled',
'visible' => 'Visible',
'Language' => 'Language',
'programming_lang' => 'programming_lang',
'programming_lang' => 'programming Language',
'Description' => 'Description',
'add_date' => 'Add Date',
'download_url' => 'Download Url',

2
www/protected/views/log/_ajaxMarkdownPreview.php
View File

@ -1,6 +1,6 @@
<?php
$this->beginWidget('CMarkdown');
$this->beginWidget('CMarkdown', array('purifyOutput'=>true));
echo $content;

7
www/protected/views/log/_form.php
View File

@ -19,7 +19,12 @@
<?php echo $form->errorSummary($model); ?>
<?php echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value'=>date('Y-m-d'))); ?>
<?php
if ($model->isNewRecord)
echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value' => date('Y-m-d')));
else
echo $form->textFieldControlGroup($model,'date',array('span'=>5, ));
?>
<?php echo $form->textAreaControlGroup($model,'title',array('rows'=>6,'span'=>8)); ?>

1
www/protected/views/log/admin.php
View File

@ -47,6 +47,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
'id'=>'log-grid',
'dataProvider'=>$model->search(),
'filter'=>$model,
'columns'=>array(
'ID',
'date',

2
www/protected/views/programs/_form.php
View File

@ -37,6 +37,8 @@
<?php echo $form->textAreaControlGroup($model,'Description',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textFieldControlGroup($model,'programming_lang',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textFieldControlGroup($model,'add_date',array('span'=>5)); ?>
<?php echo $form->textFieldControlGroup($model,'download_url',array('rows'=>6,'span'=>8)); ?>

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

@ -4,6 +4,7 @@
/* @var $pagecount integer */
/* @var $rowcount integer */
/* @var $data Program[][] */
/* @var $category string */
?>
<?php
@ -17,7 +18,12 @@ $this->breadcrumbs = array(
<div class="container">
<?php echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me"); ?>
<?php
if (empty($category))
echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me");
else
echo MsHtml::pageHeader("Programs", '"' . $category . '"');
?>
<div class="row-fluid">
<?php

7
www/protected/views/programs/view.php
View File

@ -20,6 +20,9 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<div class="container">
<?php if (! $model->enabled) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users disabled'); ?>
<?php if (! $model->visible) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users invisible'); ?>
<div class="row">
<div class="span3">
<div class="well progview_infocol">
@ -50,6 +53,10 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
<td><?php echo TbHtml::badge($model->version->Version, array('color' => TbHtml::BADGE_COLOR_INFO)); ?></td>
</tr>
<?php endif ?>
<?php
// TODO-MS Add Highscore Tables to MVC
// TODO-MS Show highest score when highscore_gid is set
?>
</table>
</div>