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

Added proper Log to msmain/index + added msmain/log + alot more

Browse Source
This commit is contained in:
Mike Schwörer 2014-06-06 12:02:56 +02:00
parent d478647418
commit 53211ea359
30 changed files with 877 additions and 963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

788
.idea/workspace.xml
View File

@ -2,12 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment=""> <list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.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/scopes/scope_settings.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
</list> </list>
<ignored path="www.mikescher.de.iws" /> <ignored path="www.mikescher.de.iws" />
@ -63,45 +63,97 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="expandedLogHeader.php" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="14" column="79" selection-start="321" selection-end="321" vertical-scroll-proportion="0.2671156" vertical-offset="0" max-vertical-offset="891"> <state line="20" column="0" selection-start="395" selection-end="478" vertical-scroll-proportion="-13.076923" vertical-offset="0" max-vertical-offset="1326">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="error.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/css/styles.css"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/error.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="295" column="0" selection-start="5050" selection-end="5050" vertical-scroll-proportion="0.0" vertical-offset="4880" max-vertical-offset="5831"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="357">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="demo.md" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="login.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/demo.md"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/login.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="399" column="118" selection-start="0" selection-end="24740" vertical-scroll-proportion="-6.6875" vertical-offset="6248" max-vertical-offset="8908"> <state line="15" column="16" selection-start="278" selection-end="278" vertical-scroll-proportion="-0.40206185" vertical-offset="489" max-vertical-offset="1071">
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider editor-type-id="MarkdownPreviewEditor"> </entry>
<state /> </file>
<file leaf-file-name="about.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="63" selection-start="488" selection-end="490" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="1530">
<folding />
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CMarkdown.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/framework/web/widgets/CMarkdown.php"> <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="70" column="20" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.3846154" vertical-offset="1081" max-vertical-offset="1972"> <state line="57" column="40" selection-start="1237" selection-end="1237" vertical-scroll-proportion="-12.576923" vertical-offset="642" max-vertical-offset="1955">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="dev.php" pinned="false" current="false" current-in-tab="false">
<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.0" vertical-offset="0" max-vertical-offset="1003">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="prod.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/config/env/prod.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="629">
<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="137" column="0" selection-start="3446" selection-end="3446" vertical-scroll-proportion="-17.0" vertical-offset="561" max-vertical-offset="1360">
<folding>
<element signature="e#1172#1319#0" expanded="false" />
<element signature="n#actionView#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#1616#1731#0" expanded="false" />
<element signature="n#actionCreate#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#2125#2302#0" expanded="false" />
<element signature="n#actionUpdate#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#2711#2937#0" expanded="false" />
<element signature="n#actionDelete#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#3448#3478#0" expanded="false" />
<element signature="n#actionIndex#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#4514#4546#0" expanded="false" />
<element signature="n#actionAdmin#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#4811#5088#0" expanded="false" />
<element signature="n#loadModelByID#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#5302#5557#0" expanded="false" />
<element signature="n#loadModelByName#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#5799#5893#0" expanded="false" />
<element signature="n#performAjaxValidation#0;n#ProgramsController#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
@ -115,57 +167,57 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/www/protected/views/programme/admin.php" />
<option value="$PROJECT_DIR$/www/javascript/scripts.js" />
<option value="$PROJECT_DIR$/www/protected/models/Programme.php" />
<option value="$PROJECT_DIR$/www/protected/views/programme/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" /> <option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" />
<option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" /> <option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/login.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/login.php" />
<option value="$PROJECT_DIR$/www/protected/models/Programs.php" /> <option value="$PROJECT_DIR$/www/protected/models/Programs.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramsHelper.php" /> <option value="$PROJECT_DIR$/www/protected/components/ProgramsHelper.php" />
<option value="$PROJECT_DIR$/framework/logging/CLogger.php" /> <option value="$PROJECT_DIR$/framework/logging/CLogger.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/update.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/about.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_search.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_view.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/_view.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" /> <option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/debugerror.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/debugerror.php" />
<option value="$PROJECT_DIR$/www/index.php" /> <option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" /> <option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret" /> <option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret" />
<option value="$PROJECT_DIR$/www/protected/config/env/.gitignore" /> <option value="$PROJECT_DIR$/www/protected/config/env/.gitignore" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret.php" /> <option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/index.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/dev.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/prod.php" /> <option value="$PROJECT_DIR$/www/protected/config/env/prod.php" />
<option value="$PROJECT_DIR$/www/protected/components/MSController.php" /> <option value="$PROJECT_DIR$/www/protected/components/MSController.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/FullPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/widgets/FullPreview.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/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" /> <option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/FullProgPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/widgets/FullProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/create.php" /> <option value="$PROJECT_DIR$/www/protected/views/programs/create.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php" />
<option value="$PROJECT_DIR$/www/protected/components/MsHtml.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/Tutorial.md" /> <option value="$PROJECT_DIR$/www/protected/components/widgets/views/Tutorial.md" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/dev.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php" /> <option value="$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/models/Log.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/index.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/components/MsHtml.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/log.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/about.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/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/login.php" />
</list> </list>
</option> </option>
</component> </component>
@ -262,20 +314,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope">
<subPane subId="Mikescher.de App">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="www.mikescher.de">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -426,6 +464,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="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="extensions" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" /> <option name="myItemId" value="www.mikescher.de" />
@ -584,9 +644,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="framework" /> <option name="myItemId" value="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope">
<subPane subId="Mikescher.de App">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="www.mikescher.de">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
@ -609,11 +687,11 @@
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<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\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\components\widgets" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\views\site" /> <recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\views\site" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\models" /> <recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\models" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\css" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<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\components\widgets" />
@ -735,24 +813,24 @@
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3244963" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32767764" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23140496" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" />
<window_info id="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="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="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3244963" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23360881" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32767764" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="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="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" />
</layout> </layout>
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@ -776,290 +854,382 @@
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
</breakpoints-dialog> </breakpoints-dialog>
<option name="time" value="22" /> <option name="time" value="23" />
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_view.php"> <entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="14" column="0" selection-start="380" selection-end="380" vertical-scroll-proportion="-9.153846" vertical-offset="0" max-vertical-offset="799" /> <state line="186" column="43" selection-start="6263" selection-end="6263" vertical-scroll-proportion="-30.5" vertical-offset="2369" max-vertical-offset="3315">
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="49" column="51" selection-start="2132" selection-end="2132" vertical-scroll-proportion="-13.153846" vertical-offset="491" max-vertical-offset="1224" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="13" selection-start="113" selection-end="113" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="901" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="78" selection-start="790" selection-end="790" vertical-scroll-proportion="0.762069" vertical-offset="0" max-vertical-offset="1530" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/yiic">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="606" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/debugerror.php">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="73" selection-start="263" selection-end="263" vertical-scroll-proportion="-7.1923075" vertical-offset="0" max-vertical-offset="459" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/index-test.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="606" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/error.php">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="37" selection-start="242" selection-end="242" vertical-scroll-proportion="-7.1923075" vertical-offset="0" max-vertical-offset="357" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/db/ar/CActiveRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1465" column="20" selection-start="52155" selection-end="52155" vertical-scroll-proportion="0.33333334" vertical-offset="24596" max-vertical-offset="41395" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/behaviors/TbWidget.php">
<provider selected="true" editor-type-id="text-editor">
<state line="43" column="11" selection-start="1115" selection-end="1115" vertical-scroll-proportion="-7.769231" vertical-offset="427" max-vertical-offset="2856" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/tests/unit/TbHtmlTest.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2102" column="24" selection-start="64541" selection-end="64541" vertical-scroll-proportion="-7.4615383" vertical-offset="35540" max-vertical-offset="66963" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbBreadcrumb.php">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="11" selection-start="1282" selection-end="1282" vertical-scroll-proportion="-7.769231" vertical-offset="614" max-vertical-offset="1275" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNav.php">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="7" selection-start="1605" selection-end="1605" vertical-scroll-proportion="-7.769231" vertical-offset="597" max-vertical-offset="2907" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbScrollspy.php">
<provider selected="true" editor-type-id="text-editor">
<state line="45" column="11" selection-start="1058" selection-end="1058" vertical-scroll-proportion="-11.615385" vertical-offset="361" max-vertical-offset="969" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="2" selection-start="2" selection-end="2" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="611" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/database-access.secret.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="72" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="238" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/CBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="91" column="0" selection-start="2912" selection-end="2912" vertical-scroll-proportion="0.19304153" vertical-offset="1256" max-vertical-offset="5117">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_view.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="708" column="0" selection-start="24111" selection-end="24111" vertical-scroll-proportion="0.19304153" vertical-offset="11745" max-vertical-offset="16813" /> <state line="49" column="36" selection-start="1568" selection-end="1576" vertical-scroll-proportion="0.22671156" vertical-offset="631" max-vertical-offset="1564">
</provider> <folding />
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="44" selection-start="461" selection-end="461" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="850" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/prod.php">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="33" selection-start="584" selection-end="584" vertical-scroll-proportion="0.5151515" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/cli/views/webapp/hg-hgignore">
<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" />
</provider>
</entry>
<entry file="uml://PHP/\Yii">
<provider selected="true" editor-type-id="UmlEditorProvider">
<state>
<ID>PHP</ID>
<OriginalElement>\Yii</OriginalElement>
<nodes>
<node x="" y="">\Yii</node>
<node x="" y="">\YiiBase</node>
</nodes>
<notes />
<edges />
<settings layout="Hierarchic Group" zoom="1.0" x="33.0" y="52.0" />
<SelectedNodes />
<Categories />
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/cli/views/webapp/protected/components/Controller.php"> <entry file="file://$PROJECT_DIR$/www/protected/models/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="5" column="6" selection-start="158" selection-end="158" vertical-scroll-proportion="0.095398426" vertical-offset="0" max-vertical-offset="891" /> <state line="112" column="35" selection-start="2710" selection-end="2710" vertical-scroll-proportion="-32.96154" vertical-offset="1047" max-vertical-offset="2057">
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/CController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="75" column="6" selection-start="3925" selection-end="3925" vertical-scroll-proportion="0.342312" vertical-offset="851" max-vertical-offset="20910" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="0.36251402" vertical-offset="0" max-vertical-offset="891" />
</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="917" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="25" selection-start="116" selection-end="116" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="3723" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="48" selection-start="778" selection-end="778" vertical-scroll-proportion="-17.923077" vertical-offset="78" max-vertical-offset="1870" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2722" column="27" selection-start="107384" selection-end="107384" vertical-scroll-proportion="0.0" vertical-offset="46274" max-vertical-offset="74137" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="164" column="73" selection-start="5845" selection-end="5845" vertical-scroll-proportion="0.0" vertical-offset="2318" max-vertical-offset="3196" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="27" selection-start="1525" selection-end="1525" vertical-scroll-proportion="0.0" vertical-offset="715" max-vertical-offset="1717" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<provider selected="true" editor-type-id="text-editor">
<state line="42" column="61" selection-start="683" selection-end="683" vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="850" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="68" column="16" selection-start="1373" selection-end="1373" vertical-scroll-proportion="-40.96154" vertical-offset="91" max-vertical-offset="1309" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="82" column="2" selection-start="2551" selection-end="2551" vertical-scroll-proportion="0.5933941" vertical-offset="873" max-vertical-offset="1751" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="19" selection-start="1088" selection-end="1088" vertical-scroll-proportion="0.22895622" vertical-offset="459" max-vertical-offset="1394" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/FullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="1" selection-start="206" selection-end="206" vertical-scroll-proportion="0.24803591" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="50" column="0" selection-start="1042" selection-end="1572" vertical-scroll-proportion="0.2278339" vertical-offset="647" max-vertical-offset="1666" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/create.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="22" selection-start="28" selection-end="28" vertical-scroll-proportion="0.019079685" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="8" column="48" selection-start="149" selection-end="149" vertical-scroll-proportion="0.019079685" vertical-offset="119" max-vertical-offset="1887" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="1" selection-start="464" selection-end="464" vertical-scroll-proportion="0.4006734" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/yiic.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="889" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="0" selection-start="439" selection-end="439" vertical-scroll-proportion="0.24859393" vertical-offset="0" max-vertical-offset="889" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/YiiBase.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="0" selection-start="0" selection-end="6" vertical-scroll-proportion="0.015748031" vertical-offset="3" max-vertical-offset="14739" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/yii.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="0" selection-start="6" selection-end="6" vertical-scroll-proportion="0.01912261" vertical-offset="0" max-vertical-offset="889" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="31" column="2" selection-start="869" selection-end="869" vertical-scroll-proportion="0.5928009" vertical-offset="0" max-vertical-offset="889" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="16" selection-start="62" selection-end="62" vertical-scroll-proportion="0.057367828" vertical-offset="0" max-vertical-offset="889">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="28" column="36" selection-start="440" selection-end="440" vertical-scroll-proportion="0.53543305" vertical-offset="0" max-vertical-offset="1122" /> <state line="36" column="51" selection-start="651" selection-end="651" vertical-scroll-proportion="-23.153847" vertical-offset="10" max-vertical-offset="901">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/web/widgets/CMarkdown.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="70" column="20" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.3846154" vertical-offset="1081" max-vertical-offset="1972"> <state line="45" column="56" selection-start="960" selection-end="960" vertical-scroll-proportion="-29.423077" vertical-offset="0" max-vertical-offset="901">
<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="10" column="32" selection-start="287" selection-end="287" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="595">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css"> <entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="295" column="0" selection-start="5050" selection-end="5050" vertical-scroll-proportion="0.0" vertical-offset="4880" max-vertical-offset="5831"> <state line="323" column="28" selection-start="5746" selection-end="5746" vertical-scroll-proportion="0.0" vertical-offset="4948" max-vertical-offset="5865">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/demo.md"> <entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="399" column="118" selection-start="0" selection-end="24740" vertical-scroll-proportion="-6.6875" vertical-offset="6248" max-vertical-offset="8908"> <state line="173" column="27" selection-start="6049" selection-end="6049" vertical-scroll-proportion="0.342312" vertical-offset="2517" max-vertical-offset="44438">
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider editor-type-id="MarkdownPreviewEditor"> </entry>
<state /> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3567" column="0" selection-start="140930" selection-end="141790" vertical-scroll-proportion="0.20875421" vertical-offset="60334" max-vertical-offset="74018">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/expandedLogHeader.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="14" column="79" selection-start="321" selection-end="321" vertical-scroll-proportion="0.2671156" vertical-offset="0" max-vertical-offset="891"> <state line="27" column="21" selection-start="445" selection-end="445" vertical-scroll-proportion="-17.653847" vertical-offset="0" max-vertical-offset="765">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="88" column="34" selection-start="1854" selection-end="1854" vertical-scroll-proportion="-3.7777777" vertical-offset="1190" max-vertical-offset="1717">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="42" selection-start="1072" selection-end="1072" vertical-scroll-proportion="-7.4615383" vertical-offset="707" max-vertical-offset="1309">
<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="56" column="46" selection-start="1536" selection-end="1536" vertical-scroll-proportion="-7.4615383" vertical-offset="758" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/form/TbForm.php">
<provider selected="true" editor-type-id="text-editor">
<state line="77" column="34" selection-start="2274" selection-end="2274" vertical-scroll-proportion="-17.153847" vertical-offset="761" max-vertical-offset="1343">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/form/TbFormButtonElement.php">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="19" selection-start="1467" selection-end="1467" vertical-scroll-proportion="-17.153847" vertical-offset="387" max-vertical-offset="969">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/form/TbFormInputElement.php">
<provider selected="true" editor-type-id="text-editor">
<state line="50" column="15" selection-start="1334" selection-end="1334" vertical-scroll-proportion="-17.346153" vertical-offset="297" max-vertical-offset="884">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/BootstrapCode.php">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="28" selection-start="1355" selection-end="1355" vertical-scroll-proportion="-7.1923075" vertical-offset="272" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="20" selection-start="1442" selection-end="1442" vertical-scroll-proportion="-13.730769" vertical-offset="289" max-vertical-offset="850">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_search.php">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="80" selection-start="996" selection-end="996" vertical-scroll-proportion="-14.384615" vertical-offset="85" max-vertical-offset="646">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/tests/unit/TbHtmlTest.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3927" column="8" selection-start="122401" selection-end="122401" vertical-scroll-proportion="-13.730769" vertical-offset="66402" max-vertical-offset="66963">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbActiveForm.php">
<provider selected="true" editor-type-id="text-editor">
<state line="722" column="32" selection-start="30135" selection-end="30135" vertical-scroll-proportion="-10.461538" vertical-offset="11900" max-vertical-offset="12461">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAffix.php">
<provider selected="true" editor-type-id="text-editor">
<state line="46" column="13" selection-start="1329" selection-end="1329" vertical-scroll-proportion="-12.115385" vertical-offset="365" max-vertical-offset="952">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAlert.php">
<provider selected="true" editor-type-id="text-editor">
<state line="88" column="21" selection-start="2778" selection-end="2778" vertical-scroll-proportion="-13.730769" vertical-offset="1037" max-vertical-offset="1598">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbBreadcrumb.php">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="17" selection-start="2099" selection-end="2099" vertical-scroll-proportion="-15.038462" vertical-offset="714" max-vertical-offset="1275">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbButtonColumn.php">
<provider selected="true" editor-type-id="text-editor">
<state line="78" column="29" selection-start="2791" selection-end="2791" vertical-scroll-proportion="-11.115385" vertical-offset="918" max-vertical-offset="1479">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbCollapse.php">
<provider selected="true" editor-type-id="text-editor">
<state line="68" column="13" selection-start="1981" selection-end="1981" vertical-scroll-proportion="-9.961538" vertical-offset="795" max-vertical-offset="1377">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbDetailView.php">
<provider selected="true" editor-type-id="text-editor">
<state line="44" column="8" selection-start="1299" selection-end="1299" vertical-scroll-proportion="-16.5" vertical-offset="319" max-vertical-offset="901">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbGridView.php">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="7" selection-start="604" selection-end="604" vertical-scroll-proportion="-7.4615383" vertical-offset="27" max-vertical-offset="1785">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbHeroUnit.php">
<provider selected="true" editor-type-id="text-editor">
<state line="59" column="13" selection-start="1505" selection-end="1505" vertical-scroll-proportion="-17.5" vertical-offset="446" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbListView.php">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="13" selection-start="1401" selection-end="1401" vertical-scroll-proportion="-17.5" vertical-offset="140" max-vertical-offset="748">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbModal.php">
<provider selected="true" editor-type-id="text-editor">
<state line="219" column="13" selection-start="6372" selection-end="6372" vertical-scroll-proportion="-7.4615383" vertical-offset="3427" max-vertical-offset="4420">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNav.php">
<provider selected="true" editor-type-id="text-editor">
<state line="85" column="17" selection-start="2589" selection-end="2589" vertical-scroll-proportion="-7.4615383" vertical-offset="1149" max-vertical-offset="2907">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNavbar.php">
<provider selected="true" editor-type-id="text-editor">
<state line="126" column="13" selection-start="3913" selection-end="3913" vertical-scroll-proportion="-17.153847" vertical-offset="1594" max-vertical-offset="2176">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbPager.php">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="17" selection-start="1780" selection-end="1780" vertical-scroll-proportion="-7.769231" vertical-offset="869" max-vertical-offset="2686">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTabs.php">
<provider selected="true" editor-type-id="text-editor">
<state line="86" column="13" selection-start="2609" selection-end="2609" vertical-scroll-proportion="-7.4615383" vertical-offset="1166" max-vertical-offset="2108">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbThumbnails.php">
<provider selected="true" editor-type-id="text-editor">
<state line="64" column="17" selection-start="1987" selection-end="1987" vertical-scroll-proportion="-14.538462" vertical-offset="608" max-vertical-offset="1190">
<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="58" column="82" selection-start="2215" selection-end="2215" vertical-scroll-proportion="-7.269231" vertical-offset="797" max-vertical-offset="1751">
<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="60" column="20" selection-start="2680" selection-end="2680" vertical-scroll-proportion="-14.538462" vertical-offset="642" max-vertical-offset="1224">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_search.php">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="68" selection-start="2414" selection-end="2414" vertical-scroll-proportion="-15.192307" vertical-offset="489" max-vertical-offset="1071">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="48" column="14" selection-start="1144" selection-end="1144" vertical-scroll-proportion="-7.5" vertical-offset="621" max-vertical-offset="1411">
<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="20" column="40" selection-start="520" selection-end="520" vertical-scroll-proportion="0.41580757" vertical-offset="98" max-vertical-offset="680">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTypeAhead.php">
<provider selected="true" editor-type-id="text-editor">
<state line="120" column="17" selection-start="3741" selection-end="3741" vertical-scroll-proportion="0.4450172" vertical-offset="1679" max-vertical-offset="2261">
<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="20" column="0" selection-start="395" selection-end="478" vertical-scroll-proportion="-13.076923" vertical-offset="0" max-vertical-offset="1326">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/error.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="608">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="27" selection-start="1768" selection-end="1768" vertical-scroll-proportion="0.48969072" vertical-offset="684" max-vertical-offset="1292">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="63" selection-start="488" selection-end="490" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="1530">
<folding />
</state>
</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.0" vertical-offset="0" max-vertical-offset="1003">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/prod.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="629">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="137" column="0" selection-start="3446" selection-end="3446" vertical-scroll-proportion="-17.0" vertical-offset="561" max-vertical-offset="1360">
<folding>
<element signature="e#1172#1319#0" expanded="false" />
<element signature="n#actionView#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#1616#1731#0" expanded="false" />
<element signature="n#actionCreate#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#2125#2302#0" expanded="false" />
<element signature="n#actionUpdate#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#2711#2937#0" expanded="false" />
<element signature="n#actionDelete#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#3448#3478#0" expanded="false" />
<element signature="n#actionIndex#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#4514#4546#0" expanded="false" />
<element signature="n#actionAdmin#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#4811#5088#0" expanded="false" />
<element signature="n#loadModelByID#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#5302#5557#0" expanded="false" />
<element signature="n#loadModelByName#0;n#ProgramsController#0;n#!!top" expanded="false" />
<element signature="e#5799#5893#0" expanded="false" />
<element signature="n#performAjaxValidation#0;n#ProgramsController#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="40" selection-start="1237" selection-end="1237" vertical-scroll-proportion="-12.576923" vertical-offset="642" max-vertical-offset="1955">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/login.php">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="16" selection-start="278" selection-end="278" vertical-scroll-proportion="-0.40206185" vertical-offset="489" max-vertical-offset="1071">
<folding /> <folding />
</state> </state>
</provider> </provider>

3
DB_Changes.txt
View File

@ -6,3 +6,6 @@ programme -> Changed Sieb_des_Erasthothenes -> Sieb des Erasthothenes (also re
programme -> Adjusted Star Ratings programme -> Adjusted Star Ratings
programme -> Niripsa[visible] = 0 programme -> Niripsa[visible] = 0
programme -> ms4_programs programme -> ms4_programs
idx_info -> ms4_log
idx_info -> new columns + full content change

20
www/css/styles.css
View File

@ -316,23 +316,25 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
.expCollHeader { .expCollHeader {
margin-bottom: 20px; margin-bottom: 20px;
border: 1px solid #D7E0E2;
border-radius: 6px;
} }
.expCollHeader > .collHeaderLinkParent { .expCollHeader > .collHeader {
border-bottom-left-radius: 0; border-width: 0;
border-bottom-right-radius: 0; border-radius: 0;
margin-bottom: 0;
} }
.expCollContent { .expCollContent {
background-color: #F5F5F5; background-color: #F5F5F5;
border: 1px solid #D7E0E2; margin-top: 0px;
border-top-width: 0px; }
border-bottom-left-radius: 6px; .expCollContent > div {
border-bottom-right-radius: 6px;
margin-top: -20px;
padding: 15px 60px; padding: 15px 60px;
} }

BIN
www/images/log/bsod_1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
www/images/log/bsod_2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 65 KiB

BIN
www/images/log/ms_de_v1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
www/images/log/ms_de_v2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
www/images/log/ms_de_v3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

41
www/protected/components/MsHtml.php
View File

@ -1,5 +1,5 @@
<?php <?php
class MsHtml extends CHtml { class MsHtml extends TbHtml {
/** /**
* @param DateTime $date * @param DateTime $date
@ -27,6 +27,45 @@ class MsHtml extends CHtml {
</div> </div>
'; ';
} }
}
/**
* @param DateTime $date
* @param string $caption
* @param $parent
* @param $target
* @return string
*/
public static function interactiveCollapsedHeader($date, $caption, $parent, $target)
{
return
'<div class="row collHeader collHeaderLinkParent">
<div class="collHeaderSpan-front">' . $date->format('d.m.Y') . '</div>
<div class="collHeaderSpan">' . $caption . '</div>
<div class="collHeaderSpan-drop"><i class="icon-tag" ></i></div>
<a class="collHeaderLink" data-toggle="collapse" ' . (empty($parent) ? ('') : ('data-parent="' . $parent . '"')) . ' href="' . $target . '">&nbsp;</a>
</div>
';
}
/**
* Generates a pager header.
* @param string $heading the heading text.
* @param string $subtext the subtext.
* @param array $htmlOptions additional HTML attributes.
* @return string the generated pager header.
*/
public static function pageHeader($heading, $subtext, $htmlOptions = array())
{
self::addCssClass('page-header', $htmlOptions);
$headerOptions = TbArray::popValue('headerOptions', $htmlOptions, array());
$subtextOptions = TbArray::popValue('subtextOptions', $htmlOptions, array());
$output = self::openTag('div', $htmlOptions);
$output .= self::openTag('h1', $headerOptions);
$output .= parent::encode($heading) . ' ' . self::tag('small', $subtextOptions, $subtext);
$output .= '</h1>';
$output .= '<hr>';
$output .= '</div>';
return $output;
} }
} }

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

@ -86,7 +86,7 @@ class ProgramHelper {
foreach ($dropDownModels as $row) { foreach ($dropDownModels as $row) {
if (is_null($row)) if (is_null($row))
$progDropDown[] = TbHtml::menuDivider(); $progDropDown[] = MsHtml::menuDivider();
else else
$progDropDown[] = array('label' => $row->Name, 'url' => $row->getLink()); $progDropDown[] = array('label' => $row->Name, 'url' => $row->getLink());
} }

33
www/protected/components/widgets/ExpandedLogHeader.php
View File

@ -6,10 +6,43 @@ class ExpandedLogHeader extends CWidget {
public $link = ''; public $link = '';
public $content = ''; public $content = '';
public $collapseID = -1;
public $collapseOwner = '';
public $collapseOpen = false;
public function run() { public function run() {
if ($this->date == null) if ($this->date == null)
$this->date = new DateTime('2000-01-01'); $this->date = new DateTime('2000-01-01');
$this->render('expandedLogHeader'); $this->render('expandedLogHeader');
} }
/**
* @return bool
*/
public function isCollapsable() {
return ($this->collapseID >= 0);
}
public function getContentID() {
return 'expCollapseElem' . $this->collapseID;
}
public function getContentTagDefinition() {
$contentClasses = 'expCollContent markdownOwner';
$contentID = '';
if ($this->isCollapsable()) {
$contentClasses .= ' collapse';
if ($this->collapseOpen) {
$contentClasses .= ' in';
}
$contentID = 'id="' . $this->getContentID() . '"';
}
$contentClasses = 'class="' . $contentClasses . '"';
return ' ' . $contentClasses . ' ' . $contentID;
}
} }

519
www/protected/components/widgets/views/demo.md
View File

@ -1,519 +0,0 @@
Let's do Befunge-93
=====================
Hello, this is my try to teach *you* a little bit of Befunge-93.
Preamble
--------
You may ask why someone should learn such a esoteric language as Befunge-93 ?
It has close to no real world application and is far away from every other language you may already know.
But wait, Befunge has one really neat property *(at least in my opinion)* its really fun to write in it. And that **because** it's totally different from every other language. Writing code in Befunge has a lot to do with planning and laying out your code.
Yes physically planning how your code will look and where you have to write specific subroutines.
But enough, let's go look at some code.
Chapter 1: A whole new Dimension
--------------------------------
### Choosing the right Tools
Okay, wait - first you need an interpreter, you know, to run the programs you will write.
For the beginning i recommend to simply use an javascript interpreter - they are missing a lot of important features, like manually jump in your program, breakpoints, or the most simple property: speed.
But they are easy too use, and for now you will write programs the size you don't need all these fancy features.
So just Google for an online-interpreter - there are many out there, and if you need an more advanced interpreter later you can take a look at my own interpreter *BefunExec*.
### The simplest program
OKay, now let's start - this time for real.
You will need an empty ASCII-encoded textfile - this will be our code.
You have to understand that Befunge operates in an 2-dimensional space - like in normal programming you have a PC (Programm Counter) that describes your current position.
In normal programs (you know, C, Phyton, Java etc) this PC is 1dimensional, in Befunge it's 2dimensional. At the begining its positioned in the top-left corner and with every tick its moving one field to the left.
So every Character in your text-document is a command - the most simple command is a space. The space is the `NOP` Command - the No operation
> **NOTE:**
>
> - Befunge operates in a 2-dimensional Grid
> - The programm-counter starts topleft and initially moves right
> - Every character in your document is then an individual command
So our first programm can be as simple as that:
~~~~~~~~~~~~~~~~
[php]
~~~~~~~~~~~~~~~~
### And it loops around
You see correct - an empty file is indeed a valid Befunge Program.
You may ask what it does. That's kinda simple, it just executes NOP over and over again.
A Befunge-93 program has the size of 80x25, and when the PC reaches the right edge it just wraps around and comes back in on the left edge.
> **NOTE:**
>
> - Befunge-93 programs have a fixed size of 80x25
> - The Befunge space is infinity - it wraps around its edges
OK, but now we want to write *real* commands to our file - there are 4 basic commands ( `v` , `>` , `^` and `<` ).
With these "arrows" you are able to change the direction of the PC.
So with these commands we are now able to write a rather simple endless-loop program:
~~~~~~~~~~~~~~~~
[php]
> v
^ <
~~~~~~~~~~~~~~~~
![img01][1]
### Stack it up
We now have a Grid where we can layout our program and a PC that runs through this grid to execute our precious programm. Isn't that wonderful?
*But wait! There's more*
In fact Befunge has one more element you should know about: **The stack**.
Every Befunge Command has a Stack you can manipulate in your program, you can do all the normal stackoperations on it, push, pop, peek etc.
The Commands to push something on the stack are `0` - `9`. So if you write
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
0 1 9 9
~~~~~~~~~~~~~~~~
it will push a zero, a one, and two nines on the stack.
If you want to end the program after that you can use the **@** Command.
> **NOTE:**
>
> - You can push a digit to the stack with the commands `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `0`
> - The Command `@` stops the program
You also easily push values to the stack with the so called *stringmode*
With the command `"` you start the *stringmode* and with the same command `"` you can also end it again.
While the *stringmode* is active every Character the PC encounters will be pushed as an ASCII-Value to the stack.
The Program
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
"abc" @
~~~~~~~~~~~~~~~~
will so leave the stack in the following state after completion:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
| 99 |
| 98 |
| 97 |
~~~~~~~~~~~~~~~~
> **NOTE:**
>
> - A `"` starts and ends the stringmode
> - While in stringmode every Command will be pushed as its ASCII Value to the stack
### Finally a real program
Okay, okay - I highly appreciate it that you are still following me. I know i promised you a Hello-World program. And I'm happy to announce that we are finally at the point where we can write it.
Only one last command is missing, the character-output (`,`) command. This command takes one value of the stack - interprets it as an ASCII-Value, and outputs it to wherever the interpreter show the output.
So now - lets write this program:
~~~~~~~~~~~~~~~~
"dlroW olleH" ,,,,,,,,,,, @
~~~~~~~~~~~~~~~~
![img02][2]
And thats it - a really simple Hello World. As you can see the program has two parts, first we fill the stack with the ASCII values for the two words "Hello World", and then we print each char to the output.
You may ask why Hello World is written backwards - that's rather simple, because we work with a stack the last pushed value is the first popped value (LI-FO principle ). And so - to output something in the correct order - we have to input it in the reversed order
Chapter 2: Let's golf
---------------------
### What we did wrong
Some of you probably know *Codegolf* . These are programming challenges with the target, to write programm-code with the least amount of bytes.
Because of the limited amount of space in Befunge, this is here more important than ever. In our last example you saw how to output a string, but as you can imagine the longer the string gets the more commas you have to write and faster than you can imagine you have filled the whole space.
So now let's try to optimize our Hello World a little bit
> **NOTE:**
> *"Good code is small code"*
### Decision, Decisions, Decisions
So you may ask what is the basic feature of a programming language, what feature can't be scrapped away without loosing something essentials.
One of these basics things is the possibility to do conditional logic. Your program has to react to something and react differently depending on the results.
So now it's time to introduce 2 new commands `|` and `_` . These commands are called "Decision making". They pop a value from the stack and change the PC direction depending on its value. The value is interpreted as an boolean, the conversion used is the same you probably know from C. If the value is Zero, its false - otherwise its true.
The `|` Command routes the PC to the top if the value is true and to the bottom if the value is false. Respective behaves the `_` command with left and right.
An other command is the `:`, what it does is pretty simple - it duplicates the top-stack value.
And the last command is `$`. It's also a kinda simple command: it pops a value from the stack - nothing more, it justs pops it and then forgets about it.
With this knowledge we can now finally optimize our *Hello World*:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
v
v , <
> "dlroW olleH" > : |
> $ @
~~~~~~~~~~~~~~~~
![img03][3]
So what happens here ?
- First we put "Hello World" reversed on the stack
- The we go in a loop, in every loop we do
- Duplicate the TOS[^tos]
- Test if the TOS is != 0 (true for every ASCII Character)
- Output the TOS
- This loop goes on until the stack is empty. When we now try to access the empty stack (with the duplicate command) it results in two zeros on the stack. This is so because an access to an empty stack will always result in a zero
- The returned zero is now interpreted as false and we exit the loop, the remaining zero on the stack is removed with the pop command and the program exits on the `@` command
> **NOTE:**
>
> - **_** and **|** change the PC direction depending on a value popped from the stack
> - **:** duplicates the top-of-stack-value
> - **$** removes the top-of-stack-value
> - Accessing an empty stack will result in a *zero*
### One step further
So our Hello World is now a lot smaller. Especially if you remove all the unneeded NOPs in the previous example.
But our standard shall be to become the very best *like no one ever was ...*.
So now I shall introduce you to one of the more interesting commands - **the trampoline** `#`
After your PC encounters the trampoline it "jumps" over the next command, this results in a few very neat tricks you can do in your code.
The next Hello World i will show you shall be our last one. This is the standard code to output a string of variable length and i don't believe that there is a more optimized way to do it. <!--- Note that for Befunge small code mostly equals fast code ! -->
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
`"dlroW olleH">:#,_@
~~~~~~~~~~~~~~~~
![img04][4]
Here you can see another neat feature of Befunge - the jump command is used twice, one time from left to right and the second time from right to left, so its used to skip two different commands (`:` and `,`) although only being one command.
Chapter 3: Everything is mathematical
-------------------------------------
### Simple Calculus 101
Our programs are still rather static, we want them to actually do some work, for example calculate something.
Luckily Befunge has a few operational commands in its repertoire.
- `+` The *ADD* command: Pops two values from the stack and pushed the result of the addition
- `-` The *SUB* command: Pops two values from the stack and pushed the result of the subtraction
- `*` The *MULT* command: Pops two values from the stack and pushed the result of the multiplication
- `/` The *DIV* command: Pops two values from the stack and pushed the result of the division
- `%` The *MOD* command: Pops two values from the stack and pushed the result of the modulo operation
- `!` The *NOT* command: Pops one value from the stack, interprets it as a boolean and pushes the negation
- `´` The *COMP* command: Pops two values from the stack and pushed the result of the compare "a>b"
So if you want to calculate `4+5` just write
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
45+
~~~~~~~~~~~~~~~~
*speak:*
- Push 4 to stack
- Push 5 to stack
- Pop 4 and 5 -> Push (4+5=)9 to the stack
And if you want `(4+5)*6+7` you write
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
45+6*7+
~~~~~~~~~~~~~~~~
or
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
4567+*+
~~~~~~~~~~~~~~~~
Some of you may say that this notation seems familiar. That's true - it's the so called postfix[^pfix] notation.
This is one of Befunge's very neat "features" writing a mathematical expression will always result in a postfix notation and you can simply write a postfix notation in Befunge.
> **NOTE:**
>
> - +, *, - ,/, %, !, ` are the operator commands
> - These pop their arguments from the stack and push the result back
> - You can write mathematical expressions in postfix notation
### ... Eight, Nine, Ten ?
Perhaps you remember Chapter 2, we learned how to push digits to the stack. But probably you will one day feel the need to have values greater `9` on the stack. Now you can't just simply write `12` to push a twelve.
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
12
~~~~~~~~~~~~~~~~
would just push a `1` and a `2` on the stack.
The only option we have is two write a formula which results in a twelve on the stack, for example:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
66+
~~~~~~~~~~~~~~~~
or
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
62*
~~~~~~~~~~~~~~~~
or
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
93+
~~~~~~~~~~~~~~~~
You see there are a lot of ways displaying the same value and we sure would like to know the best (= shortest) way to do so.
Now there are a few recipes how to do so:
#### Addition
The most simple way of displaying numbers is expressing them with addition.
So
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
12 => 93+
19 => 991+
100 => 999999999991+
~~~~~~~~~~~~~~~~
As you can see this method does not scale very well, and you will reach the acceptable limit pretty fast when the number becomes high enough.
#### Base-9
Base-9 is by far my favorite way of expressing numbers.
You probably know about different bases in number representation. `14` is `14` when written in base-10 (our everyday standard). But its also `D` in base-16 (or hexadecimal as you may know it). Or its `16` in base-8 (= octal), or its `1110` in base-2 (= binary).
Know is base-9 something you probably never heard of, its not one of the bases you meet when walking normally through life, but in this case it has its justification to exist.
Now back to work, we want to encode `105` (base-10).
`105` is `126` in base-9 and you can easily convert bases with this formula:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
(((1*9) + 2) * 9) + 6 => 105
~~~~~~~~~~~~~~~~
or in Befunge (Postfix):
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
69 29 1 *+ *+
~~~~~~~~~~~~~~~~
or shorter:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
69291*+*+
~~~~~~~~~~~~~~~~
Now you see why we use base-9, because we need to write the `9` in Befunge and `9` is the highest number we can push onto the stack in a single command.
This representation is nice because its really fast (and easy) to calculate the representation - even for big numbers, an because you can easily tell for every number you want how long its base-9-representation will be.
#### Factorization
Base-9 is nice in most cases, but often its not the optimal way. Factorization is often more compact.
The idea here is that you can split a number into its factors (and the factors should hopefully be `<10` ) and then multiply them.
So `196` `(=4*7*7)` becomes
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
477*
~~~~~~~~~~~~~~~~
Its said that this only works nice when you can factorize the number with factors smaller ten. Otherwise you would need to incorporate other mathematical operation to get to your result, finding the optimal combination here can be very CPU-intensive.
So for `107` a way of displaying it is:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
92+9*8+
~~~~~~~~~~~~~~~~
#### Stringify
At last we can use a neat little trick. When we printed "Hello World", we put the ASCII values of the individual chars onto the stack. We can use that to express greater values. For example expressing `107` is as easy as `"k"`.
And for greater values you can even go on and write expressions based on the ASCII values of character:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
"~~)'"*++ (= 1851)
~~~~~~~~~~~~~~~~
### Example
Number| Method | Code |Number| Method | Code |Number| Method | Code
------|----------------|----------------|------|----------------|----------------|------|----------------|----------------
0 | Boolean | `0` | 40 | Factorization | `58*` | 400 | Factorization | `25*5*8*`
1 | Boolean | `1` | 41 | Stringmode | `")"` | 401 | Base9 | `59894*+*+`
2 | Digit | `2` | 42 | Factorization | `67*` | 402 | Factorization | `79*4+6*`
3 | Digit | `3` | 43 | Stringmode | `"+"` | 403 | Base9 | `79894*+*+`
4 | Digit | `4` | 44 | Stringmode | `","` | 404 | Base9 | `89894*+*+`
5 | Digit | `5` | 45 | Factorization | `59*` | 405 | Factorization | `59*9*`
6 | Digit | `6` | 46 | Stringmode | `"."` | 406 | Base9 | `19095*+*+`
7 | Digit | `7` | 47 | Stringmode | `"/"` | 407 | Factorization | `59*9*2+`
8 | Digit | `8` | 48 | Factorization | `68*` | 408 | Factorization | `98+3*8*`
9 | Digit | `9` | 49 | Factorization | `77*` | 409 | Factorization | `59*9*4+`
10 | Factorization | `25*` | 50 | Stringmode | `"2"` | 410 | Base9 | `59095*+*+`
11 | Factorization | `92+` | 51 | Stringmode | `"3"` | 411 | Base9 | `69095*+*+`
12 | Factorization | `26*` | 52 | Stringmode | `"4"` | 412 | Base9 | `79095*+*+`
13 | Factorization | `94+` | 53 | Stringmode | `"5"` | 413 | Factorization | `69*5+7*`
14 | Factorization | `27*` | 54 | Factorization | `69*` | 414 | Base9 | `09195*+*+`
15 | Factorization | `35*` | 55 | Stringmode | `"7"` | 415 | Factorization | `99*2+5*`
16 | Factorization | `28*` | 56 | Factorization | `78*` | 416 | Factorization | `94+4*8*`
17 | Factorization | `98+` | 57 | Stringmode | `"9"` | 417 | Base9 | `39195*+*+`
18 | Factorization | `29*` | 58 | Stringmode | `":"` | 418 | Base9 | `49195*+*+`
19 | Base9 | `192*+` | 59 | Stringmode | `";"` | 419 | Base9 | `59195*+*+`
20 | Factorization | `45*` | 60 | Stringmode | `"<"` | 420 | Factorization | `25*6*7*`
21 | Factorization | `37*` | 61 | Stringmode | `"="` | 421 | Base9 | `79195*+*+`
22 | Base9 | `492*+` | 62 | Stringmode | `">"` | 422 | Base9 | `89195*+*+`
23 | Base9 | `592*+` | 63 | Factorization | `79*` | 423 | Factorization | `59*2+9*`
24 | Factorization | `38*` | 64 | Factorization | `88*` | 424 | Factorization | `59*8+8*`
25 | Factorization | `55*` | 65 | Stringmode | `"A"` | 425 | Factorization | `98+5*5*`
26 | Base9 | `892*+` | 66 | Stringmode | `"B"` | 426 | Factorization | `79*8+6*`
27 | Factorization | `39*` | 67 | Stringmode | `"C"` | 427 | Factorization | `69*7+7*`
28 | Factorization | `47*` | 68 | Stringmode | `"D"` | 428 | Base9 | `59295*+*+`
29 | Base9 | `293*+` | 69 | Stringmode | `"E"` | 429 | Base9 | `69295*+*+`
30 | Factorization | `56*` | 70 | Stringmode | `"F"` | 430 | Base9 | `79295*+*+`
31 | Base9 | `493*+` | 71 | Stringmode | `"G"` | 431 | Base9 | `89295*+*+`
32 | Factorization | `48*` | 72 | Factorization | `89*` | 432 | Factorization | `68*9*`
33 | Stringmode | `"!"` | 73 | Stringmode | `"I"` | 433 | Factorization | `68*9*1+`
34 | Base9 | `793*+` | 74 | Stringmode | `"J"` | 434 | Base9 | `29395*+*+`
35 | Factorization | `57*` | 75 | Stringmode | `"K"` | 435 | Base9 | `39395*+*+`
36 | Factorization | `49*` | 76 | Stringmode | `"L"` | 436 | Base9 | `49395*+*+`
37 | Stringmode | `"%"` | 77 | Stringmode | `"M"` | 437 | Factorization | `68*9*5+`
38 | Stringmode | `"&"` | 78 | Stringmode | `"N"` | 438 | Factorization | `89*1+6*`
39 | Stringmode | `"'"` | 79 | Stringmode | `"O"` | 439 | Factorization | `68*9*7+`
Chapter 4: One small step for a man
-----------------------------------
As you might see in the TableOfContents this tutorial is reaching its end.
There is only one more topic i want to present you and after that only one more example to show.
I hope I could inspire you to do a little bit more with a little bit unconventional languages. Also I hope you had as much fun reading this as I had writing this. Or - wait, no - I hope you had more fun than I ...
### Be the change you want to see
Befunge has one pretty big feature you haven't even seen now ... **self-modification**.
Yes you heard right, Befunge is capable of modifying its own code while running.
The responsible commands are `p` and `g`, namely *put* and *get*.
With *put* you can modify a specific command. *put* gets 3 Values from the stack `x`, `y` and `value`. `x` and `y` describe the position of the command and `value` is the new value of this field.
The *get* command works the other way around, it gets the value of a command at a specific position. *get* gets 2 values from the stack `x` and `y`, these values describe a specific field in the code, the command then gets the ASCII value of this command and pushed is onto the stack.
### A more complex example
Perhaps you want to try to solve the next task on your own. You already know everything you need and at the bottom of this tutorial you will find a full table of every command.
> You shall write a program that outputs the Fibonacci numbers, one after the other
> An example output would look like:
> `1,1,2,3,5,8 ...`
I write an simple solution that does this task. Note that i didn't highly optimize it on purpose, so its easier to follow whats actually going on:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
>> 100p 110p 1. ",", 1.",", > 00g 10g: 00p + :. ",", 10p v
^ <
~~~~~~~~~~~~~~~~
![img05][5]
If you want an explanation whats going on here, i also wrote an annotated version:
~~~~~~~~~~~~~~~~
[JAVASCRIPT]
[0,0] ist das erste "Speicherfeld" - es enthält den vorletzten Wert
[1,0] ist das zweite "Speicherfeld" - es enthält den letzten Wert
100p Feld[0,0] mit '1' initialisieren
110p Feld[1,0] mit '1' initialisieren
1.",", '1,' ausgeben
1.",", '1,' ausgeben
> Anfang Schleife
00g Hole [0,0]
10g Hole [1,0]
: Dupliziere [1,0]
00p Setze Feld [0,0] auf den Wert von [1,0]
+ Addiere [0,0] + [1,0]
: Dupliziere das Ergebnis
.",", Gib das Ergebnis und ein Komma aus
10p Schreibe das Ergebnis in [1,0]
v Ende Schleife
~~~~~~~~~~~~~~~~
Note that we use the Fields `[0,0]` and `[0,1]` are used as temporary "variable" fields. We can put there values with the `p` command and later read them with the `g` command
### Command overview
Charakter | Name | Description
----------|---------|---------------------------------------------------------------------
`+` | ADD | Adds two values from the stack together and pushes the result back
`-` | SUB | Subtracts two values from the stack from each other and pushes the result back
`*` | MULT | Multiplicates two values from the stack and pushes the result back
`/` | DIV | Divides two values from the stack and pushes the result back
`%` | MOD | Executes Modulo on two values from the stack and pushed teh result back
`!` | NOT | Gets a (boolean) value from the stack and pushes it negated back
`´` | GT | Pushes the result of a greater than over two value from the stack, to the stack
`^` | PCT | Set PC-Delta to *up*
`>` | PCL | Set PC-Delta to *left*
`v` | PCB | Set PC-Delta to *down*
`<` | PCR | Set PC-Delta to *right*
`?` | PCRAND | Set PC-Delta to a random direction
`\#` | JMP | Jumps over the next command
`_` | IFH | A horizontal If
`\|` | IFV | A vertical If
`:` | DUP | Duplicates the TOS
`\` | SWAP | Swaps two values from the stack
`$` | POP | Removes the TOS
`.` | OUT-INT | Outputs the TOS as a number
`,` | OUT-ASC | Outputs the TOS as a character
`&` | IN-INT | Asks the user for a number and puts it on the stack
`~` | IN-ASC | Asks the user for a character and puts it on the stack
`p` | PUT | Sets a field to a specific value
`g` | GET | Gets the value of a field and pushes it onto the stack
`@` | STOP | Stops the programm execution
`"` | STRMODE | Starts/Stops the stringmode
`0`-`9` | NUMBERS | Pushes the respective number onto the stack
[^tos]: TOS = top of stack
[^pfix]: Postfix = [Postfix notation][6]
[1]: http://i.imgur.com/Jkks7Uy.gif?1
[2]: http://i.imgur.com/Z5Ljr5Z.gif?1
[3]: http://i.imgur.com/82FKwkM.gif?1
[4]: http://i.imgur.com/AqpsPRW.gif?1
[5]: http://i.imgur.com/rxqZhIJ.gif?1
[6]: http://en.wikipedia.org/wiki/Reverse_Polish_notation

30
www/protected/components/widgets/views/expandedLogHeader.php
View File

@ -2,23 +2,29 @@
/* @var $this ExpandedLogHeader */ /* @var $this ExpandedLogHeader */
?> ?>
<div class="expCollHeader"> <div class="expCollHeader accordion-group">
<?php echo MsHtml::collapsedHeader($this->date, $this->caption, $this->link); ?> <?php
if ($this->isCollapsable()) {
echo MsHtml::interactiveCollapsedHeader($this->date, $this->caption, $this->collapseOwner, '#' . $this->getContentID());
} else {
echo MsHtml::collapsedHeader($this->date, $this->caption, $this->link);
}
?>
<div class="expCollContent markdownOwner"> <div <?php echo $this->getContentTagDefinition(); ?>>
<p> <div>
<?php <p>
<?php
$this->beginWidget('CMarkdown'); $this->beginWidget('CMarkdown');
echo file_get_contents('protected/components/widgets/views/demo.md'); echo $this->content;
$this->endWidget(); $this->endWidget();
?> ?>
</p>
<?php //echo $this->content; ?> </div>
</p>
</div> </div>
</div> </div>

8
www/protected/components/widgets/views/fullProgPreview.php
View File

@ -24,9 +24,9 @@
<?php <?php
for ($i = 0; $i < 4; $i++) { for ($i = 0; $i < 4; $i++) {
if ($i < $this->program->Sterne) if ($i < $this->program->Sterne)
echo TbHtml::icon(TbHtml::ICON_STAR); echo MsHtml::icon(MsHtml::ICON_STAR);
else else
echo TbHtml::icon(TbHtml::ICON_STAR_EMPTY); echo MsHtml::icon(MsHtml::ICON_STAR_EMPTY);
} }
?> ?>
</h2> </h2>
@ -42,7 +42,7 @@
<p> <p>
<?php <?php
if (!empty($this->program->Kategorie)) { if (!empty($this->program->Kategorie)) {
echo TbHtml::icon(TbHtml::ICON_TAG); echo MsHtml::icon(MsHtml::ICON_TAG);
echo $this->program->Kategorie . ''; echo $this->program->Kategorie . '';
} }
?> ?>
@ -51,7 +51,7 @@
<p> <p>
<?php <?php
foreach ($this->program->getLanguageList() as $lang) { foreach ($this->program->getLanguageList() as $lang) {
echo TbHtml::icon(TbHtml::ICON_GLOBE); echo MsHtml::icon(MsHtml::ICON_GLOBE);
echo $lang; echo $lang;
echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
} }

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

@ -31,7 +31,7 @@
<p> <p>
<?php <?php
if (!empty($this->category)) { if (!empty($this->category)) {
echo TbHtml::icon(TbHtml::ICON_TAG); echo MsHtml::icon(MsHtml::ICON_TAG);
echo $this->category . ''; echo $this->category . '';
} }
?> ?>
@ -40,7 +40,7 @@
<p> <p>
<?php <?php
foreach ($this->language as $lang) { foreach ($this->language as $lang) {
echo TbHtml::icon(TbHtml::ICON_GLOBE); echo MsHtml::icon(MsHtml::ICON_GLOBE);
echo $lang; echo $lang;
echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
} }
@ -52,9 +52,9 @@
<?php <?php
for ($i = 0; $i < 4; $i++) { for ($i = 0; $i < 4; $i++) {
if ($i < $this->starcount) if ($i < $this->starcount)
echo TbHtml::icon(TbHtml::ICON_STAR); echo MsHtml::icon(MsHtml::ICON_STAR);
else else
echo TbHtml::icon(TbHtml::ICON_STAR_EMPTY); echo MsHtml::icon(MsHtml::ICON_STAR_EMPTY);
} }
?> ?>
</div> </div>

9
www/protected/config/env/dev.php vendored
View File

@ -20,6 +20,15 @@ return [
'errorAction' => 'msmain/debugerror', 'errorAction' => 'msmain/debugerror',
], ],
'urlManager' =>
[
'rules' =>
[
'gii'=>'gii',
'gii/<controller:\w+>'=>'gii/<controller>',
'gii/<controller:\w+>/<action:\w+>'=>'gii/<controller>/<action>',
],
],
], ],

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

@ -10,6 +10,7 @@ require_once('protected/lib/ArrayX.php');
use Yiinitializr\Helpers\ArrayX; use Yiinitializr\Helpers\ArrayX;
return ArrayX::merge( return ArrayX::merge(
require_once('env/' . YII_CUSTOM_ENV . '.php'),
[ [
'basePath' => dirname(__FILE__) . DIRECTORY_SEPARATOR . '..', 'basePath' => dirname(__FILE__) . DIRECTORY_SEPARATOR . '..',
'name' => 'Mikescher.de', 'name' => 'Mikescher.de',
@ -54,6 +55,7 @@ return ArrayX::merge(
[ [
// enable cookie-based authentication // enable cookie-based authentication
'allowAutoLogin' => true, 'allowAutoLogin' => true,
'loginUrl'=> ['msmain/login'],
], ],
'urlManager' => 'urlManager' =>
@ -66,6 +68,9 @@ return ArrayX::merge(
'programs/' => 'programs/index', 'programs/' => 'programs/index',
'programs/view/<id>' => 'programs/view', 'programs/view/<id>' => 'programs/view',
'log' => ['msmain/log', 'defaultParams' => ['logid' => '-1']],
'log/<logid:[0-9]+>' => ['msmain/log', 'defaultParams' => ['logid' => '-1']],
'downloads/details.php' => 'programs/index', // Compatibility 'downloads/details.php' => 'programs/index', // Compatibility
'downloads/downloads.php' => 'programs/index', // Compatibility 'downloads/downloads.php' => 'programs/index', // Compatibility
'downloads/<id>' => 'programs/view', // Compatibility 'downloads/<id>' => 'programs/view', // Compatibility
@ -102,4 +107,4 @@ return ArrayX::merge(
// this is used in contact page // this is used in contact page
'adminEmail' => 'webmaster@example.com', 'adminEmail' => 'webmaster@example.com',
], ],
], require_once('env/' . YII_CUSTOM_ENV . '.php')); ]);

28
www/protected/controllers/MSMainController.php
View File

@ -4,9 +4,15 @@ class MSMainController extends MSController
{ {
public function actionIndex() public function actionIndex()
{ {
$data = array(); $criteria = new CDbCriteria;
$criteria->order = "date DESC";
$all_log = Log::model()->findAll($criteria);
/* @var $all_log Log[] */
$data = array();
$data['program'] = ProgramHelper::GetDailyProg(); $data['program'] = ProgramHelper::GetDailyProg();
$data['logs'] = $all_log;
$this->render('index', $data); $this->render('index', $data);
} }
@ -69,9 +75,6 @@ class MSMainController extends MSController
$this->render('about', $data); $this->render('about', $data);
} }
/**
* Displays the login page
*/
public function actionLogin() public function actionLogin()
{ {
$model=new LoginForm; $model=new LoginForm;
@ -95,12 +98,23 @@ class MSMainController extends MSController
$this->render('login', array('model'=>$model)); $this->render('login', array('model'=>$model));
} }
/**
* Logs out the current user and redirect to homepage.
*/
public function actionLogout() public function actionLogout()
{ {
Yii::app()->user->logout(); Yii::app()->user->logout();
$this->redirect(Yii::app()->homeUrl); $this->redirect(Yii::app()->homeUrl);
} }
public function actionLog($logid) {
$criteria = new CDbCriteria;
$criteria->order = "date DESC";
$all = Log::model()->findAll($criteria);
/* @var $all Log[] */
$this->render('log',
[
'logs' => $all,
'logid' => $logid,
]);
}
} }

115
www/protected/models/Log.php Normal file
View File

@ -0,0 +1,115 @@
<?php
/**
* This is the model class for table "{{log}}".
*
* The followings are the available columns in table '{{log}}':
* @property integer $ID
* @property string $date
* @property string $title
* @property string $content
*/
class Log extends CActiveRecord
{
/**
* @return string the associated database table name
*/
public function tableName()
{
return '{{log}}';
}
/**
* @return array validation rules for model attributes.
*/
public function rules()
{
// NOTE: you should only define rules for those attributes that
// will receive user inputs.
return array(
array('date, title, content', 'required'),
// The following rule is used by search().
array('ID, date, title, content', 'safe', 'on'=>'search'),
);
}
/**
* @return array relational rules.
*/
public function relations()
{
// NOTE: you may need to adjust the relation name and the related
// class name for the relations automatically generated below.
return array(
);
}
/**
* @return array customized attribute labels (name=>label)
*/
public function attributeLabels()
{
return array(
'ID' => 'ID',
'date' => 'Date',
'title' => 'Title',
'content' => 'Content',
);
}
/**
* Retrieves a list of models based on the current search/filter conditions.
*
* Typical usecase:
* - Initialize the model fields with values from filter form.
* - Execute this method to get CActiveDataProvider instance which will filter
* models according to data in model fields.
* - Pass data provider to CGridView, CListView or any similar widget.
*
* @return CActiveDataProvider the data provider that can return the models
* based on the search/filter conditions.
*/
public function search()
{
$criteria=new CDbCriteria;
$criteria->compare('ID',$this->ID);
$criteria->compare('date',$this->date,true);
$criteria->compare('title',$this->title,true);
$criteria->compare('content',$this->content,true);
return new CActiveDataProvider($this, array(
'criteria'=>$criteria,
));
}
/**
* Returns the static model of the specified AR class.
* Please note that you should have this exact method in all your CActiveRecord descendants!
* @param string $className active record class name.
* @return Log the static model class
*/
public static function model($className=__CLASS__)
{
return parent::model($className);
}
//####################################
//########### MY FUNCTIONS ###########
//####################################
/**
* @return DateTime
*/
public function getDateTime() {
return new DateTime($this->date);
}
/**
* @return string
*/
public function getLink() {
return '/log/' . $this->ID;
}
}

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

@ -179,4 +179,11 @@ class Program extends CActiveRecord
public function getLanguageList() { public function getLanguageList() {
return explode("|", $this->Language); return explode("|", $this->Language);
} }
/**
* @return DateTime
*/
public function getDateTime() {
return new DateTime($this->add_date);
}
} }

2
www/protected/views/layouts/column2.php
View File

@ -18,7 +18,7 @@ use Yiinitializr\Helpers\ArrayX;
<?php <?php
$this->widget('bootstrap.widgets.TbNav', $this->widget('bootstrap.widgets.TbNav',
[ [
'type' => TbHtml::NAV_TYPE_LIST, 'type' => MsHtml::NAV_TYPE_LIST,
'items' => ArrayX::merge( 'items' => ArrayX::merge(
[ [
['label' => 'List header'], ['label' => 'List header'],

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

@ -50,13 +50,13 @@
['label' => '[[Log "'.Yii::app()->user->name.'" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest] ['label' => '[[Log "'.Yii::app()->user->name.'" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest]
], ],
], ],
TbHtml::navbarSearchForm('search', '', MsHtml::navbarSearchForm('search', '',
[ [
'class' => 'pull-right', 'class' => 'pull-right',
'placeholder' => 'Search', 'placeholder' => 'Search',
'inputOptions' => 'inputOptions' =>
[ [
'append' => TbHtml::submitButton(TbHtml::icon(TbHtml::ICON_SEARCH)), 'append' => MsHtml::submitButton(MsHtml::icon(MsHtml::ICON_SEARCH)),
'addOnOptions' => 'addOnOptions' =>
[ [
'class' => 'pull-right', 'class' => 'pull-right',

34
www/protected/views/msmain/about.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* @var $this SiteController */ /* @var $this MsMainController */
$this->pageTitle=Yii::app()->name; $this->pageTitle=Yii::app()->name;
@ -14,24 +14,24 @@ $this->selectedNav = 'about';
<div class="container"> <div class="container">
<?php if (isset($alerts_success)) foreach($alerts_success as $alert) echo TbHtml::alert(TbHtml::ALERT_COLOR_SUCCESS, $alert); ?> <?php if (isset($alerts_success)) foreach($alerts_success as $alert) echo MsHtml::alert(MsHtml::ALERT_COLOR_SUCCESS, $alert); ?>
<?php if (isset($alerts_error)) foreach($alerts_error as $alert) echo TbHtml::alert(TbHtml::ALERT_COLOR_ERROR, $alert); ?> <?php if (isset($alerts_error)) foreach($alerts_error as $alert) echo MsHtml::alert(MsHtml::ALERT_COLOR_ERROR, $alert); ?>
<?php echo TbHtml::pageHeader('About Mikescher.de', ''); ?> <?php echo MsHtml::pageHeader('About Mikescher.de', ''); ?>
<div class="well cstm-well-light"> <div class="well cstm-well-light">
<p>Welcome to my private homepage.</p> <p>Welcome to my private homepage.</p>
<p>My name is Mike Schwörer, and this is my homepage - here i upload program i write in my free time and sometimes i even write a blog entry. </p> <p>My name is Mike Schwörer, and this is my homepage - here i upload program i write in my free time and sometimes i even write a blog entry. </p>
<p>If you want you can look <?php echo TbHtml::link('here', '/programs'); ?> at the things I programd </p> <p>If you want you can look <?php echo MsHtml::link('here', '/programs'); ?> at the things I programd </p>
</div> </div>
<div class="well cstm-well-light"> <div class="well cstm-well-light">
<?php <?php
$form = $this->beginWidget('bootstrap.widgets.TbActiveForm', $form = $this->beginWidget('bootstrap.widgets.TbActiveForm',
[ [
'layout' => TbHtml::FORM_LAYOUT_HORIZONTAL 'layout' => MsHtml::FORM_LAYOUT_HORIZONTAL
]); ]);
?> ?>
@ -41,37 +41,37 @@ $this->selectedNav = 'about';
echo $form->textFieldControlGroup($model, 'name', echo $form->textFieldControlGroup($model, 'name',
[ [
'placeholder' => 'Name', 'placeholder' => 'Name',
'size' => TbHtml::INPUT_SIZE_XXLARGE, 'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_USER), 'prepend' => MsHtml::icon(MsHtml::ICON_USER),
'span' => 2, 'span' => 2,
]); ]);
echo $form->textFieldControlGroup($model, 'email', echo $form->textFieldControlGroup($model, 'email',
[ [
'placeholder' => 'Email address', 'placeholder' => 'Email address',
'size' => TbHtml::INPUT_SIZE_XXLARGE, 'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_ENVELOPE), 'prepend' => MsHtml::icon(MsHtml::ICON_ENVELOPE),
'span' => 2, 'span' => 2,
]); ]);
echo $form->textFieldControlGroup($model, 'header', echo $form->textFieldControlGroup($model, 'header',
[ [
'placeholder' => 'Header', 'placeholder' => 'Header',
'size' => TbHtml::INPUT_SIZE_XXLARGE, 'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_TAG), 'prepend' => MsHtml::icon(MsHtml::ICON_TAG),
'span' => 5, 'span' => 5,
]); ]);
echo $form->textAreaControlGroup( $model, 'message', echo $form->textAreaControlGroup( $model, 'message',
[ [
'placeholder' => 'Message', 'placeholder' => 'Message',
'size' => TbHtml::INPUT_SIZE_XXLARGE, 'size' => MsHtml::INPUT_SIZE_XXLARGE,
'rows' => 10, 'rows' => 10,
]); ]);
?> ?>
</fieldset> </fieldset>
<?php echo TbHtml::formActions( <?php echo MsHtml::formActions(
[ [
TbHtml::submitButton('Submit', array('color' => TbHtml::BUTTON_COLOR_PRIMARY)), MsHtml::submitButton('Submit', array('color' => MsHtml::BUTTON_COLOR_PRIMARY)),
TbHtml::resetButton('Reset'), MsHtml::resetButton('Reset'),
], ],
[ [
'class' => 'cstm-background-white', 'class' => 'cstm-background-white',
@ -80,6 +80,6 @@ $this->selectedNav = 'about';
<?php $this->endWidget(); ?> <?php $this->endWidget(); ?>
</div> </div>
<?php echo TbHtml::well( file_get_contents('protected/data/disclaimer.php') ); ?> <?php echo MsHtml::well( file_get_contents('protected/data/disclaimer.php') ); ?>
</div> </div>

53
www/protected/views/msmain/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* @var $this MsMainController */ /* @var $this MsMainController */
/* @var $program Program */ /* @var $program Program */
/* @var $logs Log[] */
$this->pageTitle=Yii::app()->name; $this->pageTitle=Yii::app()->name;
@ -18,44 +19,30 @@ $this->selectedNav = 'index';
<!-- Main hero unit for a primary marketing message or call to action --> <!-- Main hero unit for a primary marketing message or call to action -->
<?php <?php
$this->widget('FullProgPreview', $this->widget('FullProgPreview',
[ [
'caption' => "Program of the Day:", 'caption' => "Program of the Day:",
'program' => $program, 'program' => $program,
]); ]);
$i = 0;
foreach ($logs as $logelem) {
if ($i == 0) {
$this->widget('ExpandedLogHeader',
[
'date' => $logelem->getDateTime(),
'caption' => $logelem->title,
'link' => '',
'content' => $logelem->content,
]);
} else {
echo MsHtml::collapsedHeader($logelem->getDateTime(), $logelem->title, $logelem->getLink());
}
$i++;
}
?> ?>
<?php
$this->widget('ExpandedLogHeader',
[
'date' => new DateTime(),
'caption' => 'test',
'link' => '#',
'content' =>
'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna
aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
]);
?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World", "/log/1"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
</div> </div>

40
www/protected/views/msmain/log.php Normal file
View File

@ -0,0 +1,40 @@
<?php
/* @var $this MsMainController */
/* @var $logs Log[] */
/* @var $logid integer */
$this->pageTitle=Yii::app()->name;
$this->breadcrumbs=
[
'Log'
];
$this->selectedNav = '';
?>
<div class="container">
<?php echo MsHtml::pageHeader("Site-log", "Changelog and Blog for mikescher.de"); ?>
<div class="accordion" id="lca">
<?php
$i = 0;
foreach($logs as $logelem) {
$i++;
$this->widget('ExpandedLogHeader',
[
'date' => new DateTime($logelem->date),
'caption' => $logelem->title,
'content' => $logelem->content,
'collapseID' => $i,
'collapseOwner' => '#lca',
'collapseOpen' => ($logelem->ID == $logid),
]);
}
?>
</div>
</div>

69
www/protected/views/msmain/login.php
View File

@ -9,47 +9,50 @@ $this->breadcrumbs = array(
); );
?> ?>
<div class="container well"> <div class="container">
<h1>Login</h1> <?php echo MsHtml::pageHeader("Login", ""); ?>
<p>Please fill out the following form with your login credentials:</p> <div class="well">
<div class="form"> <p>Please fill out the following form with your login credentials:</p>
<?php $form = $this->beginWidget('TbActiveForm', array(
'id' => 'login-form',
'enableClientValidation' => true,
'clientOptions' => array(
'validateOnSubmit' => true,
),
)); ?>
<p class="note">Fields with <span class="required">*</span> are required.</p> <div class="form">
<?php $form = $this->beginWidget('TbActiveForm', array(
'id' => 'login-form',
'enableClientValidation' => true,
'clientOptions' => array(
'validateOnSubmit' => true,
),
)); ?>
<div> <p class="note">Fields with <span class="required">*</span> are required.</p>
<?php echo $form->labelEx($model, 'username'); ?>
<?php echo $form->textField($model, 'username'); ?>
<?php echo $form->error($model, 'username'); ?>
</div>
<div> <div>
<?php echo $form->labelEx($model, 'password'); ?> <?php echo $form->labelEx($model, 'username'); ?>
<?php echo $form->passwordField($model, 'password'); ?> <?php echo $form->textField($model, 'username'); ?>
<?php echo $form->error($model, 'password'); ?> <?php echo $form->error($model, 'username'); ?>
</div> </div>
<div class="rememberMe"> <div>
<?php echo $form->checkBox($model, 'rememberMe'); ?> <?php echo $form->labelEx($model, 'password'); ?>
<?php echo $form->label($model, 'rememberMe'); ?> <?php echo $form->passwordField($model, 'password'); ?>
<?php echo $form->error($model, 'rememberMe'); ?> <?php echo $form->error($model, 'password'); ?>
</div> </div>
<div class="buttons"> <div class="rememberMe">
<?php echo TbHtml::submitButton('Login'); ?> <?php echo $form->checkBox($model, 'rememberMe'); ?>
</div> <?php echo $form->label($model, 'rememberMe'); ?>
<?php echo $form->error($model, 'rememberMe'); ?>
</div>
<?php $this->endWidget(); ?> <div class="buttons">
</div> <?php echo MsHtml::submitButton('Login'); ?>
<!-- form --> </div>
<?php $this->endWidget(); ?>
</div> <!-- form -->
</div> <!-- Well -->
</div><!-- Container --> </div><!-- Container -->

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

@ -56,9 +56,9 @@
<?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?> <?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?>
<div class="form-actions"> <div class="form-actions">
<?php echo TbHtml::submitButton($model->isNewRecord ? 'Create' : 'Save',array( <?php echo MsHtml::submitButton($model->isNewRecord ? 'Create' : 'Save',array(
'color'=>TbHtml::BUTTON_COLOR_PRIMARY, 'color'=>MsHtml::BUTTON_COLOR_PRIMARY,
'size'=>TbHtml::BUTTON_SIZE_LARGE, 'size'=>MsHtml::BUTTON_SIZE_LARGE,
)); ?> )); ?>
</div> </div>

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

@ -50,7 +50,7 @@
<?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?> <?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?>
<div class="form-actions"> <div class="form-actions">
<?php echo TbHtml::submitButton('Search', array('color' => TbHtml::BUTTON_COLOR_PRIMARY,));?> <?php echo MsHtml::submitButton('Search', array('color' => MsHtml::BUTTON_COLOR_PRIMARY,));?>
</div> </div>
<?php $this->endWidget(); ?> <?php $this->endWidget(); ?>

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

@ -46,7 +46,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
</div><!-- search-form --> </div><!-- search-form -->
<br><br> <br><br>
<?php $this->widget('bootstrap.widgets.TbGridView',array( <?php $this->widget('bootstrap.widgets.TbGridView',array(
'type' => TbHtml::GRID_TYPE_BORDERED, 'type' => MsHtml::GRID_TYPE_BORDERED,
'id'=>'program-grid', 'id'=>'program-grid',
'dataProvider'=>$model->search(), 'dataProvider'=>$model->search(),
'filter'=>$model, 'filter'=>$model,

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

@ -19,8 +19,7 @@
<div class="container"> <div class="container">
<h1>My Programs</h1> <?php echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me"); ?>
<br><br>
<div class="row-fluid"> <div class="row-fluid">
<?php <?php
@ -29,6 +28,7 @@
echo '<ul class="thumbnails">'; echo '<ul class="thumbnails">';
foreach($datarow as $dataelem) { foreach($datarow as $dataelem) {
/* @var $dataelem Program */
$this->widget('ThumbnailProgPreview', $this->widget('ThumbnailProgPreview',
[ [
'caption' => $dataelem->Thumbnailname, 'caption' => $dataelem->Thumbnailname,
@ -39,7 +39,7 @@
'image' => $dataelem->getImagePath(), 'image' => $dataelem->getImagePath(),
'starcount' => $dataelem->Sterne, 'starcount' => $dataelem->Sterne,
'downloads' => $dataelem->Downloads, 'downloads' => $dataelem->Downloads,
'date' => new DateTime($dataelem->add_date), 'date' => $dataelem->getDateTime(),
'enabled' => $dataelem->enabled, 'enabled' => $dataelem->enabled,
'programminglang' => $dataelem->programming_lang, 'programminglang' => $dataelem->programming_lang,
]); ]);
@ -61,7 +61,7 @@
} }
$pagination_arr[] = ['label' => '&raquo;', 'url' => '?page=' . ($page+1), 'disabled' => ($page >= $pagecount)]; $pagination_arr[] = ['label' => '&raquo;', 'url' => '?page=' . ($page+1), 'disabled' => ($page >= $pagecount)];
echo TbHtml::pagination($pagination_arr, echo MsHtml::pagination($pagination_arr,
[ [
'align' => 'right', 'align' => 'right',
]); ]);