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

Added CRUD for Logs

Browse Source
This commit is contained in:
Mike Schwörer 2014-06-06 19:31:05 +02:00
parent 53211ea359
commit 4b9310d69c
21 changed files with 811 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

681
.idea/workspace.xml generated
View File

@ -2,13 +2,13 @@
<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/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> <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/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
</list> </list>
<ignored path="www.mikescher.de.iws" /> <ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -63,97 +63,35 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="admin.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <state line="36" column="62" selection-start="738" selection-end="738" vertical-scroll-proportion="-17.76923" vertical-offset="150" max-vertical-offset="1241">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="error.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="main.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/error.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="357"> <state line="49" column="88" selection-start="1927" selection-end="1927" vertical-scroll-proportion="0.46910754" vertical-offset="423" max-vertical-offset="1683">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="login.php" pinned="false" current="true" current-in-tab="true">
<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 />
</state>
</provider>
</entry>
</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>
</entry>
</file>
<file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<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>
</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> <folding>
<element signature="e#1172#1319#0" expanded="false" /> <marker date="1402075581793" expanded="true" signature="2632:2667" placeholder="..." />
<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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="admin.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/log/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="28" column="0" selection-start="537" selection-end="558" vertical-scroll-proportion="-18.307692" vertical-offset="0" max-vertical-offset="1071">
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
@ -167,14 +105,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.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/models/Programs.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramsHelper.php" />
<option value="$PROJECT_DIR$/framework/logging/CLogger.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/about.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/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" />
@ -197,27 +127,35 @@
<option value="$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php" /> <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/config/env/dev.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/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/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/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/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/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.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/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/msmain/about.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/_form.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/_search.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/admin.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/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" /> <option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/index.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" /> <option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php" />
<option value="$PROJECT_DIR$/www/protected/models/Log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_form.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/LogController.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/debugerror.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/error.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/login.php" /> <option value="$PROJECT_DIR$/www/protected/views/msmain/login.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
</list> </list>
</option> </option>
</component> </component>
@ -231,7 +169,7 @@
<option name="x" value="55" /> <option name="x" value="55" />
<option name="y" value="-8" /> <option name="y" value="-8" />
<option name="width" value="1873" /> <option name="width" value="1873" />
<option name="height" value="1096" /> <option name="height" value="1092" />
</component> </component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default"> <entry key="Project Default">
@ -314,6 +252,20 @@
<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>
@ -385,8 +337,30 @@
<option name="myItemId" value="views" /> <option name="myItemId" value="views" />
<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_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="programs" /> <option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="msmain" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -412,7 +386,7 @@
<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="msmain" /> <option name="myItemId" value="log" />
<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>
@ -464,28 +438,6 @@
<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" />
@ -530,32 +482,6 @@
<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="config" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="env" />
<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" />
@ -654,20 +580,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </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>
</subPane>
</pane>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -808,12 +720,12 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="55" y="-8" width="1873" height="1096" extended-state="6" /> <frame x="55" y="-8" width="1873" height="1092" extended-state="0" />
<editor active="true" /> <editor active="true" />
<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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694355" 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="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="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" />
@ -822,15 +734,15 @@
<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="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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23581268" 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="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="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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@ -858,331 +770,129 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="186" column="43" selection-start="6263" selection-end="6263" vertical-scroll-proportion="-30.5" vertical-offset="2369" max-vertical-offset="3315">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_view.php">
<provider selected="true" editor-type-id="text-editor">
<state line="49" column="36" selection-start="1568" selection-end="1576" vertical-scroll-proportion="0.22671156" vertical-offset="631" max-vertical-offset="1564">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Log.php">
<provider selected="true" editor-type-id="text-editor">
<state line="112" column="35" selection-start="2710" selection-end="2710" vertical-scroll-proportion="-32.96154" vertical-offset="1047" max-vertical-offset="2057">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor">
<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>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="323" column="28" selection-start="5746" selection-end="5746" vertical-scroll-proportion="0.0" vertical-offset="4948" max-vertical-offset="5865">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="173" column="27" selection-start="6049" selection-end="6049" vertical-scroll-proportion="0.342312" vertical-offset="2517" max-vertical-offset="44438">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="3567" column="0" selection-start="140930" selection-end="141790" vertical-scroll-proportion="0.20875421" vertical-offset="60334" max-vertical-offset="74018">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/log.php">
<provider selected="true" editor-type-id="text-editor">
<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"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/BootstrapCode.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_form.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_form.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_search.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/gii/bootstrap/templates/default/_search.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/tests/unit/TbHtmlTest.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/tests/unit/TbHtmlTest.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAffix.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAffix.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAlert.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbAlert.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbBreadcrumb.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbBreadcrumb.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbButtonColumn.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbButtonColumn.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbCollapse.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbCollapse.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbDetailView.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbDetailView.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbGridView.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbGridView.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbHeroUnit.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbHeroUnit.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbListView.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbListView.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbModal.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbModal.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNav.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNav.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNavbar.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNavbar.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbPager.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbPager.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTabs.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTabs.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbThumbnails.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbThumbnails.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/_search.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_search.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/admin.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/admin.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTypeAhead.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbTypeAhead.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="20" column="0" selection-start="395" selection-end="478" vertical-scroll-proportion="-13.076923" vertical-offset="0" max-vertical-offset="1326"> <state line="20" column="0" selection-start="395" selection-end="478" vertical-scroll-proportion="0.0" vertical-offset="340" 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 /> <folding />
</state> </state>
</provider> </provider>
@ -1194,46 +904,187 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="137" column="0" selection-start="3446" selection-end="3446" vertical-scroll-proportion="-17.0" vertical-offset="561" max-vertical-offset="1360"> <state line="3348" column="27" selection-start="132363" selection-end="132363" vertical-scroll-proportion="0.3427283" vertical-offset="56493" max-vertical-offset="74018">
<folding> <folding />
<element signature="e#1172#1319#0" expanded="false" /> </state>
<element signature="n#actionView#0;n#ProgramsController#0;n#!!top" expanded="false" /> </provider>
<element signature="e#1616#1731#0" expanded="false" /> </entry>
<element signature="n#actionCreate#0;n#ProgramsController#0;n#!!top" expanded="false" /> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<element signature="e#2125#2302#0" expanded="false" /> <provider selected="true" editor-type-id="text-editor">
<element signature="n#actionUpdate#0;n#ProgramsController#0;n#!!top" expanded="false" /> <state line="19" column="63" selection-start="488" selection-end="490" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="1530">
<element signature="e#2711#2937#0" expanded="false" /> <folding />
<element signature="n#actionDelete#0;n#ProgramsController#0;n#!!top" expanded="false" /> </state>
<element signature="e#3448#3478#0" expanded="false" /> </provider>
<element signature="n#actionIndex#0;n#ProgramsController#0;n#!!top" expanded="false" /> </entry>
<element signature="e#4514#4546#0" expanded="false" /> <entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
<element signature="n#actionAdmin#0;n#ProgramsController#0;n#!!top" expanded="false" /> <provider selected="true" editor-type-id="text-editor">
<element signature="e#4811#5088#0" expanded="false" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1003">
<element signature="n#loadModelByID#0;n#ProgramsController#0;n#!!top" expanded="false" /> <folding />
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.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="57" column="40" selection-start="1237" selection-end="1237" vertical-scroll-proportion="-12.576923" vertical-offset="642" max-vertical-offset="1955"> <state line="70" column="53" selection-start="1528" selection-end="1528" vertical-scroll-proportion="-21.076923" vertical-offset="642" max-vertical-offset="1955">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="6" selection-start="738" selection-end="738" vertical-scroll-proportion="-25.5" vertical-offset="0" max-vertical-offset="765">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="77" selection-start="678" selection-end="678" vertical-scroll-proportion="0.40248027" vertical-offset="0" max-vertical-offset="887">
<folding>
<marker date="1402070789932" expanded="true" signature="-1:-1" placeholder="SELECT SValu..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="39" selection-start="158" selection-end="182" vertical-scroll-proportion="73.88461" vertical-offset="2040" max-vertical-offset="4216">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/create.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="913">
<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="443" column="20" selection-start="17569" selection-end="17569" vertical-scroll-proportion="-11.692307" vertical-offset="7125" max-vertical-offset="12461">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ExpandedLogHeader.php">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="20" selection-start="562" selection-end="562" vertical-scroll-proportion="-19.26923" vertical-offset="9" 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="18" column="0" selection-start="428" selection-end="516" vertical-scroll-proportion="-11.769231" vertical-offset="0" max-vertical-offset="595">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Log.php">
<provider selected="true" editor-type-id="text-editor">
<state line="31" column="43" selection-start="725" selection-end="725" vertical-scroll-proportion="-0.65384614" vertical-offset="510" max-vertical-offset="2057">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="14" selection-start="71" selection-end="71" vertical-scroll-proportion="-3.9230769" vertical-offset="0" max-vertical-offset="204">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/CController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="864" column="20" selection-start="32477" selection-end="32477" vertical-scroll-proportion="0.3427283" vertical-offset="14265" max-vertical-offset="20910">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/login.php"> <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="15" column="16" selection-start="278" selection-end="278" vertical-scroll-proportion="-0.40206185" vertical-offset="489" max-vertical-offset="1071"> <state line="1" column="20" selection-start="26" selection-end="26" vertical-scroll-proportion="0.019165726" vertical-offset="0" max-vertical-offset="1071">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/error.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="20" selection-start="26" selection-end="26" vertical-scroll-proportion="0.019165726" vertical-offset="0" max-vertical-offset="887">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/_form.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="115" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.7316798" vertical-offset="14" max-vertical-offset="969">
<folding>
<marker date="1402073199523" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="111" column="17" selection-start="2044" selection-end="2044" vertical-scroll-proportion="0.31003383" vertical-offset="1612" max-vertical-offset="2584">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/debugerror.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="20" selection-start="26" selection-end="26" vertical-scroll-proportion="0.019165726" vertical-offset="0" max-vertical-offset="887">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/LogController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="25" selection-start="774" selection-end="774" vertical-scroll-proportion="0.67080045" vertical-offset="0" max-vertical-offset="3417">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="6" selection-start="12" selection-end="12" vertical-scroll-proportion="-0.43742955" vertical-offset="405" max-vertical-offset="1292">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="36" column="62" selection-start="738" selection-end="738" vertical-scroll-proportion="-17.76923" vertical-offset="150" max-vertical-offset="1241">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state line="28" column="0" selection-start="537" selection-end="558" vertical-scroll-proportion="-18.307692" vertical-offset="0" max-vertical-offset="1071">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="49" column="28" selection-start="832" selection-end="832" vertical-scroll-proportion="0.63307774" vertical-offset="255" max-vertical-offset="6103">
<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="49" column="88" selection-start="1927" selection-end="1927" vertical-scroll-proportion="0.46910754" vertical-offset="423" max-vertical-offset="1683">
<folding>
<marker date="1402075581793" expanded="true" signature="2632:2667" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

2
DB_Changes.txt
View File

@ -9,3 +9,5 @@ programme -> ms4_programs
idx_info -> ms4_log idx_info -> ms4_log
idx_info -> new columns + full content change idx_info -> new columns + full content change
othervalues -> ms4_othervalues

14
www/css/styles.css
View File

@ -39,6 +39,20 @@
margin-bottom: 0px; margin-bottom: 0px;
} }
.cstm-main-navbar-highlight > a {
color: yellow !important;
background-color: gray;
border-radius: 6px;
margin-left: 20px;
}
.cstm-main-navbar-highlight > a:hover {
color: black !important;
background-color: lightgray !important;;
border-radius: 6px;
margin-left: 20px;
}
img.grayscale { img.grayscale {
/* Firefox 10+, Firefox on Android */ /* Firefox 10+, Firefox on Android */
filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");

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

@ -19,7 +19,7 @@ class UserIdentity extends CUserIdentity
{ {
$connection = Yii::app()->db; $connection = Yii::app()->db;
$command=$connection->createCommand("SELECT SValue FROM othervalues WHERE Name = 'AdminPassword'"); $command=$connection->createCommand("SELECT SValue FROM {{othervalues}} WHERE Name = 'AdminPassword'");
$pw = $command->queryScalar(); $pw = $command->queryScalar();
$users=array( $users=array(

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

@ -68,8 +68,8 @@ 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/' => ['log/index', 'defaultParams' => ['logid' => '-1']],
'log/<logid:[0-9]+>' => ['msmain/log', 'defaultParams' => ['logid' => '-1']], 'log/<logid:[0-9]+>' => ['log/index', '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

195
www/protected/controllers/LogController.php Normal file
View File

@ -0,0 +1,195 @@
<?php
class LogController extends MsController
{
public $layout='//layouts/column2';
public $menu=array();
/**
* @return array action filters
*/
public function filters()
{
return array(
'accessControl', // perform access control for CRUD operations
'postOnly + delete', // we only allow deletion via POST request
);
}
/**
* Specifies the access control rules.
* This method is used by the 'accessControl' filter.
* @return array access control rules
*/
public function accessRules()
{
return array(
array('allow',
'actions'=>array('index', 'ajaxMarkdownPreview'),
'users'=>array('*'),
),
array('allow',
'actions'=>array('create','update','admin','delete','view'),
'users'=>array('admin'),
),
array('deny',
'users'=>array('*'),
),
);
}
/**
* Lists all models.
*/
public function actionIndex($logid)
{
$this->layout='//layouts/main';
$criteria = new CDbCriteria;
$criteria->order = "date DESC";
$all = Log::model()->findAll($criteria);
/* @var $all Log[] */
$this->render('index',
[
'logs' => $all,
'logid' => $logid,
]);
}
public function actionAjaxMarkdownPreview() {
if(Yii::app()->request->isAjaxRequest){
$this->renderPartial('_ajaxMarkdownPreview',
[
'content' => $_POST['content'],
],
false, true);
} else {
throw new CHttpException(400,'Invalid request. This is a Ajax only action.');
}
}
/**
* Displays a particular model.
* @param integer $id the ID of the model to be displayed
*/
public function actionView($id)
{
$this->render('view',array(
'model'=>$this->loadModel($id),
));
}
/**
* Creates a new model.
* If creation is successful, the browser will be redirected to the 'view' page.
*/
public function actionCreate()
{
$model=new Log;
// Uncomment the following line if AJAX validation is needed
// $this->performAjaxValidation($model);
if(isset($_POST['Log']))
{
$model->attributes=$_POST['Log'];
if($model->save())
$this->redirect(array('view','id'=>$model->ID));
}
$this->render('create',array(
'model'=>$model,
));
}
/**
* Updates a particular model.
* If update is successful, the browser will be redirected to the 'view' page.
* @param integer $id the ID of the model to be updated
*/
public function actionUpdate($id)
{
$model=$this->loadModel($id);
// Uncomment the following line if AJAX validation is needed
// $this->performAjaxValidation($model);
if(isset($_POST['Log']))
{
$model->attributes=$_POST['Log'];
if($model->save())
$this->redirect(array('view','id'=>$model->ID));
}
$this->render('update',array(
'model'=>$model,
));
}
/**
* Deletes a particular model.
* If deletion is successful, the browser will be redirected to the 'admin' page.
* @param integer $id the ID of the model to be deleted
* @throws CHttpException
*/
public function actionDelete($id)
{
if (Yii::app()->request->isPostRequest) {
// we only allow deletion via POST request
$this->loadModel($id)->delete();
// if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser
if (!isset($_GET['ajax'])) {
$this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin'));
}
} else {
throw new CHttpException(400,'Invalid request. Please do not repeat this request again.');
}
}
/**
* Manages all models.
*/
public function actionAdmin()
{
$model=new Log('search');
$model->unsetAttributes(); // clear any default values
if(isset($_GET['Log']))
$model->attributes=$_GET['Log'];
$this->render('admin',array(
'model'=>$model,
));
}
/**
* Returns the data model based on the primary key given in the GET variable.
* If the data model is not found, an HTTP exception will be raised.
* @param integer $id the ID of the model to be loaded
* @return Log the loaded model
* @throws CHttpException
*/
public function loadModel($id)
{
$model=Log::model()->findByPk($id);
if($model===null)
throw new CHttpException(404,'The requested page does not exist.');
return $model;
}
/**
* Performs the AJAX validation.
* @param Log $model the model to be validated
*/
protected function performAjaxValidation($model)
{
if(isset($_POST['ajax']) && $_POST['ajax']==='log-form')
{
echo CActiveForm::validate($model);
Yii::app()->end();
}
}
}

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

@ -2,6 +2,38 @@
class MSMainController extends MSController class MSMainController extends MSController
{ {
/**
* @return array action filters
*/
public function filters()
{
return array(
'accessControl',
);
}
/**
* Specifies the access control rules.
* This method is used by the 'accessControl' filter.
* @return array access control rules
*/
public function accessRules()
{
return array(
array('allow',
'actions'=>array('index', 'about', 'debugerror', 'error', 'login', 'logout'),
'users'=>array('*'),
),
array('allow',
'actions'=>array('admin'),
'users'=>array('admin'),
),
array('deny',
'users'=>array('*'),
),
);
}
public function actionIndex() public function actionIndex()
{ {
$criteria = new CDbCriteria; $criteria = new CDbCriteria;
@ -77,7 +109,7 @@ class MSMainController extends MSController
public function actionLogin() public function actionLogin()
{ {
$model=new LoginForm; $model = new LoginForm();
// if it is ajax validation request // if it is ajax validation request
if(isset($_POST['ajax']) && $_POST['ajax']==='login-form') if(isset($_POST['ajax']) && $_POST['ajax']==='login-form')
@ -98,6 +130,11 @@ class MSMainController extends MSController
$this->render('login', array('model'=>$model)); $this->render('login', array('model'=>$model));
} }
public function actionAdmin()
{
$this->render('admin', array());
}
public function actionLogout() public function actionLogout()
{ {
Yii::app()->user->logout(); Yii::app()->user->logout();
@ -105,16 +142,6 @@ class MSMainController extends MSController
} }
public function actionLog($logid) { 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,
]);
} }
} }

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

@ -47,10 +47,10 @@
['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')], ['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']], ['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')], ['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
['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, 'htmlOptions' => ['class' => 'cstm-main-navbar-highlight']]
], ],
], ],
MsHtml::navbarSearchForm('search', '', MsHtml::navbarSearchForm('/search', '',
[ [
'class' => 'pull-right', 'class' => 'pull-right',
'placeholder' => 'Search', 'placeholder' => 'Search',
@ -89,10 +89,6 @@
</div> </div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="<?php echo (YII_DEBUG ? 'bootstrap.js' : 'bootstrap.min.js') ?>"></script>
<script src="/js/plugins.js"></script>
<script src="/js/main.js"></script>
<script src="/javascript/scripts.js"></script> <script src="/javascript/scripts.js"></script>
</body> </body>
</html> </html>

7
www/protected/views/log/_ajaxMarkdownPreview.php Normal file
View File

@ -0,0 +1,7 @@
<?php
$this->beginWidget('CMarkdown');
echo $content;
$this->endWidget();

52
www/protected/views/log/_form.php Normal file
View File

@ -0,0 +1,52 @@
<?php
/* @var $this LogController */
/* @var $model Log */
/* @var $form TbActiveForm */
?>
<div class="form">
<?php $form=$this->beginWidget('bootstrap.widgets.TbActiveForm', array(
'id'=>'log-form',
// Please note: When you enable ajax validation, make sure the corresponding
// controller action is handling ajax validation correctly.
// There is a call to performAjaxValidation() commented in generated controller code.
// See class documentation of CActiveForm for details on this.
'enableAjaxValidation'=>false,
)); ?>
<p class="help-block">Fields with <span class="required">*</span> are required.</p>
<?php echo $form->errorSummary($model); ?>
<?php echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value'=>date('Y-m-d'))); ?>
<?php echo $form->textAreaControlGroup($model,'title',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textAreaControlGroup($model,'content',array('rows'=>6,'span'=>8)); ?>
<?php echo MsHtml::ajaxButton ("Preview", CController::createUrl('log/ajaxMarkdownPreview'),
[
'type'=>'POST',
'data' => ['content'=> 'js: $("#Log_content").val()'],
'update' => '#markdownAjaxContent',
'error'=>'function(msg){alert("An error has happened");}',
]); ?>
<br>
<br>
<div class="well markdownOwner" id="markdownAjaxContent">
<?php $this->renderPartial('_ajaxMarkdownPreview', ['content' => $model->content, ], false, true); ?>
</div>
<div class="form-actions">
<?php echo MsHtml::submitButton($model->isNewRecord ? 'Create' : 'Save',array(
'color'=>MsHtml::BUTTON_COLOR_PRIMARY,
'size'=>MsHtml::BUTTON_SIZE_LARGE,
)); ?>
</div>
<?php $this->endWidget(); ?>
</div><!-- form -->

28
www/protected/views/log/_search.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/* @var $this LogController */
/* @var $model Log */
/* @var $form CActiveForm */
?>
<div class="wide form">
<?php $form=$this->beginWidget('bootstrap.widgets.TbActiveForm', array(
'action'=>Yii::app()->createUrl($this->route),
'method'=>'get',
)); ?>
<?php echo $form->textFieldControlGroup($model,'ID',array('span'=>5)); ?>
<?php echo $form->textFieldControlGroup($model,'date',array('span'=>5)); ?>
<?php echo $form->textAreaControlGroup($model,'title',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textAreaControlGroup($model,'content',array('rows'=>6,'span'=>8)); ?>
<div class="form-actions">
<?php echo MsHtml::submitButton('Search', array('color' => MsHtml::BUTTON_COLOR_PRIMARY,));?>
</div>
<?php $this->endWidget(); ?>
</div><!-- search-form -->

25
www/protected/views/log/_view.php Normal file
View File

@ -0,0 +1,25 @@
<?php
/* @var $this LogController */
/* @var $data Log */
?>
<div class="view">
<b><?php echo CHtml::encode($data->getAttributeLabel('ID')); ?>:</b>
<?php echo CHtml::link(CHtml::encode($data->ID),array('view','id'=>$data->ID)); ?>
<br />
<b><?php echo CHtml::encode($data->getAttributeLabel('date')); ?>:</b>
<?php echo CHtml::encode($data->date); ?>
<br />
<b><?php echo CHtml::encode($data->getAttributeLabel('title')); ?>:</b>
<?php echo CHtml::encode($data->title); ?>
<br />
<b><?php echo CHtml::encode($data->getAttributeLabel('content')); ?>:</b>
<?php echo CHtml::encode($data->content); ?>
<br />
</div>

58
www/protected/views/log/admin.php Normal file
View File

@ -0,0 +1,58 @@
<?php
/* @var $this LogController */
/* @var $model Log */
$this->breadcrumbs=array(
'Logs'=>array('index'),
'Manage',
);
$this->menu=array(
array('label'=>'List Log', 'url'=>array('index')),
array('label'=>'Create Log', 'url'=>array('create')),
);
Yii::app()->clientScript->registerScript('search', "
$('.search-button').click(function(){
$('.search-form').toggle();
return false;
});
$('.search-form form').submit(function(){
$('#log-grid').yiiGridView('update', {
data: $(this).serialize()
});
return false;
});
");
?>
<h1>Manage Logs</h1>
<p>
You may optionally enter a comparison operator (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>
&lt;&gt;</b>
or <b>=</b>) at the beginning of each of your search values to specify how the comparison should be done.
</p>
<?php echo CHtml::link('Advanced Search','#',array('class'=>'search-button btn')); ?>
<div class="search-form" style="display:none">
<?php $this->renderPartial('_search',array(
'model'=>$model,
)); ?>
</div><!-- search-form -->
<?php $this->widget('bootstrap.widgets.TbGridView',array(
'id'=>'log-grid',
'dataProvider'=>$model->search(),
'filter'=>$model,
'columns'=>array(
'ID',
'date',
'title',
'content',
array(
'class'=>'bootstrap.widgets.TbButtonColumn',
),
),
)); ?>

20
www/protected/views/log/create.php Normal file
View File

@ -0,0 +1,20 @@
<?php
/* @var $this LogController */
/* @var $model Log */
?>
<?php
$this->breadcrumbs=array(
'Logs'=>array('index'),
'Create',
);
$this->menu=array(
array('label'=>'List Log', 'url'=>array('index')),
array('label'=>'Manage Log', 'url'=>array('admin')),
);
?>
<h1>Create Log</h1>
<?php $this->renderPartial('_form', array('model'=>$model)); ?>

40
www/protected/views/log/index.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) { //TODO-MS Translate all log things to eng
$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>

23
www/protected/views/log/update.php Normal file
View File

@ -0,0 +1,23 @@
<?php
/* @var $this LogController */
/* @var $model Log */
?>
<?php
$this->breadcrumbs=array(
'Logs'=>array('index'),
$model->title=>array('view','id'=>$model->ID),
'Update',
);
$this->menu=array(
array('label'=>'List Log', 'url'=>array('index')),
array('label'=>'Create Log', 'url'=>array('create')),
array('label'=>'View Log', 'url'=>array('view', 'id'=>$model->ID)),
array('label'=>'Manage Log', 'url'=>array('admin')),
);
?>
<h1>Update Log <?php echo $model->ID; ?></h1>
<?php $this->renderPartial('_form', array('model'=>$model)); ?>

34
www/protected/views/log/view.php Normal file
View File

@ -0,0 +1,34 @@
<?php
/* @var $this LogController */
/* @var $model Log */
?>
<?php
$this->breadcrumbs=array(
'Logs'=>array('index'),
$model->title,
);
$this->menu=array(
array('label'=>'List Log', 'url'=>array('index')),
array('label'=>'Create Log', 'url'=>array('create')),
array('label'=>'Update Log', 'url'=>array('update', 'id'=>$model->ID)),
array('label'=>'Delete Log', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->ID),'confirm'=>'Are you sure you want to delete this item?')),
array('label'=>'Manage Log', 'url'=>array('admin')),
);
?>
<h1>View Log #<?php echo $model->ID; ?></h1>
<?php $this->widget('zii.widgets.CDetailView',array(
'htmlOptions' => array(
'class' => 'table table-striped table-condensed table-hover',
),
'data'=>$model,
'attributes'=>array(
'ID',
'date',
'title',
'content',
),
)); ?>

2
www/protected/views/msmain/debugerror.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* @var $this SiteController */ /* @var $this MsMainController */
/* @var $error array */ /* @var $error array */
$this->pageTitle=Yii::app()->name . ' - Error'; $this->pageTitle=Yii::app()->name . ' - Error';

2
www/protected/views/msmain/error.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* @var $this SiteController */ /* @var $this MsMainController */
/* @var $error array */ /* @var $error array */
$this->pageTitle=Yii::app()->name . ' - Error'; $this->pageTitle=Yii::app()->name . ' - Error';

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

@ -1,40 +0,0 @@
<?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>

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

@ -1,5 +1,5 @@
<?php <?php
/* @var $this SiteController */ /* @var $this MsMainController */
/* @var $model LoginForm */ /* @var $model LoginForm */
/* @var $form CActiveForm */ /* @var $form CActiveForm */