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

Added proper Description Implementation and Layout for programs

Browse Source
This commit is contained in:
Mike Schwörer 2014-07-05 21:15:24 +02:00
parent eb5c4fd7e0
commit 427b5b1dc4
13 changed files with 600 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

464
.idea/workspace.xml
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/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<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/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<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/encodings.xml" />
</list>
<ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" />
@ -63,73 +63,48 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="ProgDescription.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ProgDescription.php">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="49" selection-start="399" selection-end="399" vertical-scroll-proportion="-13.730769" vertical-offset="0" max-vertical-offset="612">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="progDescription_tabbed.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/progDescription_tabbed.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="12" selection-start="113" selection-end="113" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="425">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="progDescription.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/progDescription.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="0" selection-start="101" selection-end="229" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="357">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="121" selection-start="1642" selection-end="1642" vertical-scroll-proportion="0.0" vertical-offset="1020" max-vertical-offset="2108">
<folding />
<state line="91" column="103" selection-start="2939" selection-end="2939" vertical-scroll-proportion="-16.846153" vertical-offset="871" max-vertical-offset="1734">
<folding>
<element signature="tag#head#0;tag#html#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="187" column="23" selection-start="4726" selection-end="4734" vertical-scroll-proportion="0.0" vertical-offset="3179" max-vertical-offset="4369">
<folding />
</state>
</provider>
</entry>
</file>
<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="35" column="51" selection-start="690" selection-end="710" vertical-scroll-proportion="0.0" 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="0.0" vertical-offset="170" 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="0.0" vertical-offset="120" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false">
<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.0" vertical-offset="1429" max-vertical-offset="9894">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="view.php" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="view.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="27" selection-start="1797" selection-end="1797" vertical-scroll-proportion="-7.8076925" vertical-offset="766" max-vertical-offset="2822">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="yiic.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/yiic.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="35" selection-start="298" selection-end="298" vertical-scroll-proportion="0.2905983" vertical-offset="0" max-vertical-offset="585">
<state line="139" column="69" selection-start="3922" selection-end="3922" vertical-scroll-proportion="3.2947977" vertical-offset="653" max-vertical-offset="2601">
<folding />
</state>
</provider>
@ -148,14 +123,9 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/www/extendedGitGraph.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
<option value="$PROJECT_DIR$/www/protected/data/.gitignore" />
<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/create.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/view.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php" />
@ -176,11 +146,9 @@
<option value="$PROJECT_DIR$/www/protected/views/programupdates/index.php" />
<option value="$PROJECT_DIR$/www/protected/models/ProgramUpdates.php" />
<option value="$PROJECT_DIR$/www/protected/views/programupdates/view.php" />
<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/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" />
@ -191,14 +159,21 @@
<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" />
<option value="$PROJECT_DIR$/www/protected/yiic.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/MsHelper.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/ProgDescription.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/progDescription.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/progDescription_tabbed.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
</list>
</option>
</component>
@ -345,6 +320,102 @@
<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="programs" />
<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="layouts" />
<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" />
@ -423,6 +494,32 @@
<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="extendedGitGraph" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
@ -476,17 +573,17 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets\views" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\views\api" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\controllers" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\views\msmain" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets\views" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets" />
</key>
</component>
<component name="RunManager" selected="PHP HTTP Request.www.mikescher.de - Index">
<component name="RunManager" selected="PHP HTTP Request.www.mikescher.de - Prog">
<configuration default="false" name="index.php" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true" temporary="true" uri="http://localhost:63342/www.mikescher.de/www/index.php">
<method />
</configuration>
@ -541,12 +638,20 @@
<ConfigurationWrapper RunnerId="PhpRunner" />
<method />
</configuration>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - Index" />
<item index="1" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - About" />
<item index="2" class="java.lang.String" itemvalue="JavaScript Debug.index.php" />
<item index="3" class="java.lang.String" itemvalue="PHP Script.index.php" />
<item index="4" class="java.lang.String" itemvalue="PHP Script.egh.php" />
<configuration default="false" name="www.mikescher.de - Prog" type="PhpHttpRequestRunConfigurationType" factoryName="PHP HTTP Request" server_name="Localhost" url="/programs/view/Crystal%20Grid">
<RunnerSettings RunnerId="PhpHttpRequestDebugRunner" />
<RunnerSettings RunnerId="PhpRunner" />
<ConfigurationWrapper RunnerId="PhpHttpRequestDebugRunner" />
<ConfigurationWrapper RunnerId="PhpRunner" />
<method />
</configuration>
<list size="6">
<item index="0" class="java.lang.String" itemvalue="JavaScript Debug.index.php" />
<item index="1" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - Index" />
<item index="2" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - About" />
<item index="3" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - Prog" />
<item index="4" class="java.lang.String" itemvalue="PHP Script.index.php" />
<item index="5" class="java.lang.String" itemvalue="PHP Script.egh.php" />
</list>
<recent_temporary>
<list size="3">
@ -609,24 +714,24 @@
<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="true" 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="false" 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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27052343" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27327824" 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.39448568" 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" />
<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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32661718" sideWeight="0.4997245" 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.32661718" 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="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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="UnknownFeatures">
@ -650,62 +755,15 @@
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="35" />
<option name="time" value="46" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<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">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/YiiBase.php">
<provider selected="true" editor-type-id="text-editor">
<state line="129" column="21" selection-start="4654" selection-end="4654" vertical-scroll-proportion="0.28846154" vertical-offset="1875" max-vertical-offset="14739" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="60" selection-start="549" selection-end="549" vertical-scroll-proportion="9.538462" vertical-offset="673" max-vertical-offset="1309" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/base/CHttpException.php">
<provider selected="true" editor-type-id="text-editor">
<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$/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" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/data/programs/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="5" selection-start="5" selection-end="5" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="611" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="41" selection-start="386" selection-end="386" vertical-scroll-proportion="0.4068376" vertical-offset="0" max-vertical-offset="595" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<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/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" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/index.php">
<provider selected="true" editor-type-id="text-editor">
<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/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" />
@ -721,11 +779,6 @@
<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/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" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="80.42308" vertical-offset="2091" max-vertical-offset="2720" />
@ -750,11 +803,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php">
<provider selected="true" editor-type-id="text-editor">
<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/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" />
@ -810,11 +858,6 @@
<state line="57" column="34" selection-start="1152" selection-end="1152" vertical-scroll-proportion="0.22895622" vertical-offset="765" max-vertical-offset="2227" />
</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" />
</provider>
</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.667789" vertical-offset="0" max-vertical-offset="891" />
@ -862,13 +905,6 @@
<state line="39" column="76" selection-start="1634" selection-end="1634" vertical-scroll-proportion="-15.0" vertical-offset="273" max-vertical-offset="1224" />
</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/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">
@ -918,23 +954,119 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/yiic.php">
<provider selected="true" editor-type-id="text-editor">
<state line="8" column="43" selection-start="218" selection-end="218" vertical-scroll-proportion="0.23247863" vertical-offset="0" max-vertical-offset="585">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="36" selection-start="399" selection-end="399" vertical-scroll-proportion="0.4051282" vertical-offset="154" max-vertical-offset="765">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-5.7062936" vertical-offset="3264" max-vertical-offset="8483">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="37" column="5" selection-start="817" selection-end="817" vertical-scroll-proportion="-15.384615" vertical-offset="229" max-vertical-offset="748">
<folding>
<marker date="1404571661284" expanded="true" signature="-1:-1" placeholder="SELECT SValu..." />
<marker date="1404571661284" expanded="true" signature="-1:-1" placeholder="SELECT [Valu..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="213" column="0" selection-start="6291" selection-end="6291" vertical-scroll-proportion="-6.4615383" vertical-offset="3453" max-vertical-offset="4335">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="41" selection-start="386" selection-end="386" vertical-scroll-proportion="0.42774567" vertical-offset="16" max-vertical-offset="595">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<state line="31" column="55" selection-start="626" selection-end="639" vertical-scroll-proportion="1.0154142" vertical-offset="0" max-vertical-offset="901">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/style.css">
<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="1615">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="143" column="44" selection-start="3068" selection-end="3068" vertical-scroll-proportion="-14.5" vertical-offset="2054" max-vertical-offset="3009">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.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="680">
<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="91" column="103" selection-start="2939" selection-end="2939" vertical-scroll-proportion="-16.846153" vertical-offset="871" max-vertical-offset="1734">
<folding>
<element signature="tag#head#0;tag#html#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ProgDescription.php">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="49" selection-start="399" selection-end="399" vertical-scroll-proportion="-13.730769" vertical-offset="0" max-vertical-offset="612">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/progDescription_tabbed.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="12" selection-start="113" selection-end="113" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="425">
<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.0" vertical-offset="1429" max-vertical-offset="9894">
<state line="617" column="1" selection-start="10817" selection-end="10817" vertical-scroll-proportion="0.7816514" vertical-offset="10063" max-vertical-offset="10829">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/progDescription.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="0" selection-start="101" selection-end="229" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="357">
<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="57" column="27" selection-start="1797" selection-end="1797" vertical-scroll-proportion="-7.8076925" vertical-offset="766" max-vertical-offset="2822">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/yiic.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="35" selection-start="298" selection-end="298" vertical-scroll-proportion="0.2905983" vertical-offset="0" max-vertical-offset="585">
<state line="139" column="69" selection-start="3922" selection-end="3922" vertical-scroll-proportion="3.2947977" vertical-offset="653" max-vertical-offset="2601">
<folding />
</state>
</provider>

58
www/css/styles.css
View File

@ -1,8 +1,29 @@
/* Basic
-------------------------------------------------- */
html,
body {
margin:0;
padding:0;
height:100%;
}
/* Footer
-------------------------------------------------- */
#fullbodywrapper {
min-height:100%;
position:relative;
}
.footer {
padding: 45px 0;
width:100%;
height:80px;
position:absolute;
bottom:0;
left:0;
padding: 25px 0 0 0;
margin-top: 70px;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
@ -574,3 +595,38 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
padding-bottom: 10px;
}
.progview_maincol > .tabbable > .tab-content {
background-color: #ECF0F1;
margin: -20px 0px 0px 0px;
padding: 0px 5px 0px 5px;
border-radius: 0px 0px 6px 6px;
}
.progview_maincol > .tabbable >.nav-tabs >.active > a {
background-color: #ECF0F1;
}
.progview_maincol > .tabbable >.nav-tabs a:hover,
.progview_maincol > .tabbable >.nav-tabs a:active,
.progview_maincol > .tabbable >.nav-tabs a:focus {
outline: 0 !important;
}
.well .progview_caption {
margin: -19px -19px 28px -19px;
}
.progview_caption {
background-color: #2C3E50;
color: #ECF0F1;
text-shadow: 0px 0px 4px #000;
padding: 6px;
margin-bottom: 28px;
border-radius: 6px 6px 0px 0px;
}

0
www/data/programs/desc/Crystal Grid/Instructions.markdown → www/data/programs/desc/Crystal Grid/01_Instructions.markdown
View File

0
www/data/programs/desc/Crystal Grid/Tricks.markdown → www/data/programs/desc/Crystal Grid/02_Tricks.markdown
View File

16
www/protected/components/MsHelper.php
View File

@ -20,4 +20,20 @@ class MsHelper {
return $val;
}
public static function startsWith($haystack, $needle)
{
$length = strlen($needle);
return (substr($haystack, 0, $length) === $needle);
}
public static function endsWith($haystack, $needle)
{
$length = strlen($needle);
if ($length == 0) {
return true;
}
return (substr($haystack, -$length) === $needle);
}
}

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

@ -99,4 +99,74 @@ class ProgramHelper {
return $progDropDown;
}
public static function convertDescriptionListToTabs($descriptions, $name) {
$tabs = array();
foreach($descriptions as $desc)
{
if ($desc['type'] === 0)
{
$tabs[] =
[
'label' => $desc['name'],
'items' => self::convertDescriptionListToTabs($desc['items'], $name),
];
}
else if (strcasecmp($desc['name'], 'index') == 0) // == 0 : true
{
$tabs[] =
[
'label' => $name,
'content' => self::getDescriptionMarkdownTab($desc['path']),
'active' => true,
];
}
else
{
$tabs[] =
[
'label' => $desc['name'],
'content' => self::getDescriptionMarkdownTab($desc['path']),
];
}
}
return $tabs;
}
public static function getDescriptionMarkdownTab($path)
{
$md = new CMarkdown;
$content = file_get_contents($path);
$result = '<div class="markdownOwner"><div><p>';
$result .= $md->transform($content);
$result .= '</p></div></div>';
return $result;
}
/**
* @param $filename
* @param $number
* @return string
*/
public static function getIndexedFilename($filename, &$number)
{
$bn = basename($filename, '.markdown');
if ($bn[0] >= '0' && $bn[0] <= '9' && $bn[1] >= '0' && $bn[1] <= '9' && $bn[2] == '_')
{
$name = substr($bn, 3);
$number = substr($bn, 0, 2) + 0;
}
else
{
$name = $bn;
$number = -1;
}
return $name;
}
}

31
www/protected/components/widgets/ProgDescription.php Normal file
View File

@ -0,0 +1,31 @@
<?php
class ProgDescription extends CWidget {
/**
* @var $program Program
*/
public $program;
public function run() {
$descriptions = $this->program->getDescriptions();
if (count($descriptions) === 1)
{
$this->render('progDescription',
[
'name' => $this->program->Name,
'descriptions' => $descriptions,
]);
}
else
{
$this->render('progDescription_tabbed',
[
'name' => $this->program->Name,
'descriptions' => $descriptions,
]);
}
}
}

16
www/protected/components/widgets/views/progDescription.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/* @var $this ProgDescription */
/* @var $name string */
/* @var $descriptions array() */
?>
<div class="well progview_maincol">
<div class="progview_caption" >
<h1 class="text-center"><?php echo $name; ?></h1>
</div>
<?php
echo ProgramHelper::getDescriptionMarkdownTab($descriptions[0]['path']);
?>
</div>

20
www/protected/components/widgets/views/progDescription_tabbed.php Normal file
View File

@ -0,0 +1,20 @@
<?php
/* @var $this ProgDescription */
/* @var $name string */
/* @var $descriptions array() */
?>
<div class="progview_maincol">
<div class="progview_caption" >
<h1 class="text-center"><?php echo $name; ?></h1>
</div>
<?php
$this->widget('bootstrap.widgets.TbTabs',
[
'tabs' => ProgramHelper::convertDescriptionListToTabs($descriptions, $name),
]
);
?>
</div>

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

@ -50,7 +50,6 @@ class Program extends CActiveRecord
array('update_identifier', 'length', 'max'=>64),
array('programming_lang', 'length', 'max'=>16),
// The following rule is used by search().
// @TODO-MS Please remove those attributes that should not be searched.
array('ID, 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, highscore_gid', 'safe', 'on'=>'search'),
);
}
@ -204,4 +203,47 @@ class Program extends CActiveRecord
return $out;
}
/**
* @return array()
*/
public function getDescriptions()
{
$result = array();
$path = "data/programs/desc/" . $this->Name . "/*";
$tl_paths = glob($path, GLOB_MARK);
foreach ($tl_paths as $fn)
{
if (MsHelper::endsWith($fn, "\\"))
{
$bl_paths = glob($fn . '*.markdown');
$bl_arr = array();
foreach ($bl_paths as $bl_fn)
{
$bl_arr[] = ['type' => 1, 'name' => ProgramHelper::getIndexedFilename($bl_fn, $num), 'path' => $bl_fn];
}
$result[] = ['type' => 0,'name' => ProgramHelper::getIndexedFilename($fn, $num), 'items' => $bl_arr];
}
else if (MsHelper::endsWith($fn, ".markdown"))
{
$ifn = ProgramHelper::getIndexedFilename($fn, $num);
if (strcasecmp($ifn, "index") == 0) // == 0 : true
{
array_unshift($result, ['type' => 1,'name' => $ifn, 'path' => $fn]);
}
else
{
$result[] = ['type' => 1,'name' => $ifn, 'path' => $fn];
}
}
}
return $result;
}
}

63
www/protected/views/layouts/main.php
View File

@ -13,14 +13,14 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?php
echo $this->pageTitle; ?></title>
echo $this->pageTitle; ?></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<link rel="icon" type="image/png" href="/images/favicon.png" /> <?php //TODO-MS Add nice favicon ?>
<link rel="icon" type="image/png" href="/images/favicon.png"/> <?php //TODO-MS Add nice favicon ?>
<?php Yii::app()->bootstrap->register(); ?>
<link rel="stylesheet" type="text/css" href="/css/styles.css" />
<link rel="stylesheet" type="text/css" href="/css/styles.css"/>
<title><?php echo CHtml::encode($this->pageTitle); ?></title>
</head>
@ -29,13 +29,15 @@
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<!endif]-->
<?php
if (! isset($this->selectedNav)) $this->selectedNav = "";
<div id="fullbodywrapper">
<?php
if (!isset($this->selectedNav)) $this->selectedNav = "";
$this->widget('bootstrap.widgets.TbNavbar',
[
'brandLabel'=>'<img src="/images/logo_static.png" class="brandLogo"/>',
'brandUrl'=>'/',
'brandLabel' => '<img src="/images/logo_static.png" class="brandLogo"/>',
'brandUrl' => '/',
'display' => null,
'htmlOptions' =>
[
@ -47,12 +49,12 @@
'class' => 'bootstrap.widgets.TbNav',
'items' =>
[
['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
['label' => '[[Log "'.Yii::app()->user->name.'" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest, 'htmlOptions' => ['class' => 'cstm-main-navbar-highlight']]
['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
['label' => '[[Log "' . Yii::app()->user->name . '" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest, 'htmlOptions' => ['class' => 'cstm-main-navbar-highlight']]
],
],
MsHtml::navbarSearchForm('/search', '',
@ -71,37 +73,38 @@
]),
],
]);
?>
?>
<?php
if(isset($this->breadcrumbs))
{
<?php
if (isset($this->breadcrumbs)) {
$this->widget('bootstrap.widgets.TbBreadcrumb',
[
'links'=>$this->breadcrumbs,
'links' => $this->breadcrumbs,
]);
}
?>
?>
<?php
<?php
echo $content;
?>
?>
<div class="footer">
Copyright &copy; <?php echo date('Y'); ?> by Mike Schwörer &#xb7; <i><a href="/admin">{{admin}}</a></i><br/>
All Rights Reserved.<br/>
<?php echo Yii::powered(); ?>
</div>
<div class="footer">
Copyright &copy; <?php echo date('Y'); ?> by Mike Schwörer &#xb7; <a href="/admin">admin</a><br/>
All Rights Reserved.<br/>
<?php echo Yii::powered(); ?>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="/javascript/scripts.js"></script>
<?php
foreach($this->js_scripts as $script ) {
echo '<script type="text/javascript" language="JavaScript">', PHP_EOL;
echo $script;
echo '</script>', PHP_EOL;
}
foreach ($this->js_scripts as $script) {
echo '<script type="text/javascript" language="JavaScript">', PHP_EOL;
echo $script;
echo '</script>', PHP_EOL;
}
?>
</body>

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

@ -21,7 +21,7 @@ $this->selectedNav = '';
<div class="accordion" id="lca">
<?php
$i = 0;
foreach($logs as $logelem) { //TODO-MS Translate all log things to eng
foreach($logs as $logelem) {
$i++;
$this->widget('ExpandedLogHeader',

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

@ -20,8 +20,8 @@ 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'); ?>
<?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">
@ -63,7 +63,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
<div class="text-right progview_inforow">
<?php if ($model->uses_absCanv): ?>
<a href="/programs/view/AbsCanvas">
<?php echo TbHtml::badge('AbsCanvas', array('color' => TbHtml::BADGE_COLOR_WARNING)); ?>
<?php echo TbHtml::badge('AbsCanvas', array('color' => TbHtml::BADGE_COLOR_WARNING)); ?>
</a>
<?php endif ?>
@ -73,28 +73,15 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
</div>
<div class="span6">
<div class="well">
<h1 class="text-center"><?php echo $model->Name; ?></h1>
<hr/>
<div class="markdownOwner">
<div>
<p>
<?php
$this->beginWidget('CMarkdown');
for ($i = 0; $i < 24; $i++)
echo $model->Description . '<br>';
$this->endWidget();
?>
</p>
</div>
</div>
</div>
<?php
$this->widget('ProgDescription',
[
'program' => $model,
]
);
?>
</div>
<div class="span3">
<div class="well">
<img src="<?php echo $model->getImagePath(); ?>" class="progview_image"/>
@ -106,12 +93,12 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
'block' => true,
'color' => TbHtml::BUTTON_COLOR_PRIMARY,
'size' => TbHtml::BUTTON_SIZE_DEFAULT,
'url' => '#',
'url' => '#', //TODO-MS Add Download link
]);
?>
<?php
if (! empty($model->github_url))
if (!empty($model->github_url))
echo TbHtml::linkbutton('Github',
[
'block' => true,
@ -122,7 +109,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<?php
if (! empty($model->sourceforge_url))
if (!empty($model->sourceforge_url))
echo TbHtml::linkbutton('Sourceforge',
[
'block' => true,
@ -133,7 +120,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<?php
if (! empty($model->homepage_url))
if (!empty($model->homepage_url))
echo TbHtml::linkbutton('Homepage',
[
'block' => true,
@ -150,7 +137,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
'block' => true,
'color' => TbHtml::BUTTON_COLOR_SUCCESS,
'size' => TbHtml::BUTTON_SIZE_DEFAULT,
'url' => '#',
'url' => '#', //TODO-MS Add Highscore link
]);
?>
</div>