Added Code for DailyProg
This commit is contained in:
parent
5210478251
commit
d74a13f661
@ -2,13 +2,13 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
|
||||
<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/modules.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
|
||||
</list>
|
||||
<ignored path="www.mikescher.de.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
@ -66,7 +66,7 @@
|
||||
<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="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="1751">
|
||||
<state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-0.0" vertical-offset="1139" max-vertical-offset="1751">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -75,23 +75,72 @@
|
||||
<file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-13.538462" vertical-offset="5" max-vertical-offset="680">
|
||||
<state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-9.807693" vertical-offset="102" max-vertical-offset="680">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="main.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/views/site/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="19" column="23" selection-start="315" selection-end="315" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="1564">
|
||||
<folding>
|
||||
<marker date="1401262284212" expanded="true" signature="824:847" placeholder="SELECT * FRO..programme..." />
|
||||
</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/views/layouts/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="71" column="17" selection-start="2099" selection-end="2099" vertical-scroll-proportion="0.39285713" vertical-offset="987" max-vertical-offset="2312">
|
||||
<state line="44" column="85" selection-start="1413" selection-end="1413" vertical-scroll-proportion="-16.26923" vertical-offset="325" max-vertical-offset="1768">
|
||||
<folding>
|
||||
<marker date="1400836934640" expanded="true" signature="3258:3293" placeholder="..." />
|
||||
<marker date="1401259726860" expanded="true" signature="2456:2491" placeholder="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="UserIdentity.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="22" column="46" selection-start="673" selection-end="673" vertical-scroll-proportion="-11.576923" vertical-offset="73" max-vertical-offset="646">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="ProgrammeHelper.php" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="36" column="95" selection-start="908" selection-end="908" vertical-scroll-proportion="0.19927536" vertical-offset="502" max-vertical-offset="1360">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="SeededRandom.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="35" column="27" selection-start="557" selection-end="557" vertical-scroll-proportion="-13.038462" vertical-offset="256" max-vertical-offset="850">
|
||||
<folding>
|
||||
<element signature="e#6#84#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="SiteController.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="58" selection-start="183" selection-end="183" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="1173">
|
||||
<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/site/about.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -104,16 +153,7 @@
|
||||
<file leaf-file-name="ProgrammeController.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-6.5384617" vertical-offset="2040" max-vertical-offset="3111">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="CController.php" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/framework/web/CController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-1.7692307" vertical-offset="13044" max-vertical-offset="20910">
|
||||
<state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-34.0" vertical-offset="1326" max-vertical-offset="3111">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -134,9 +174,7 @@
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/www/index.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/models/SendMailForm.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/controllers/SiteController.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/views/layouts/column-2.php" />
|
||||
@ -152,7 +190,12 @@
|
||||
<option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/views/programme/index.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
|
||||
<option value="$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -234,6 +277,7 @@
|
||||
<sortByType />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -406,6 +450,28 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="www.mikescher.de" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="www.mikescher.de" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="www" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="protected" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="components" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="www.mikescher.de" />
|
||||
@ -444,13 +510,12 @@
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="options.lastSelected" value="settings" />
|
||||
<property name="options.lastSelected" value="preferences.keymap" />
|
||||
<property name="options.splitter.main.proportions" value="0.3" />
|
||||
<property name="options.splitter.details.proportions" value="0.2" />
|
||||
<property name="options.searchVisible" value="true" />
|
||||
@ -577,7 +642,7 @@
|
||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21157025" 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.2137741" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33722162" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
|
||||
@ -585,12 +650,12 @@
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="Vcs.Log.UiProperties">
|
||||
@ -615,23 +680,6 @@
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="72" column="32" selection-start="1575" selection-end="1575" vertical-scroll-proportion="0.0" vertical-offset="816" max-vertical-offset="1751">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/demos/blog/index.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="596" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/demos/default/protected/views/site/login.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="6" column="0" selection-start="145" selection-end="183" vertical-scroll-proportion="0.17894737" vertical-offset="0" max-vertical-offset="1003" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbArray.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="33" column="55" selection-start="1094" selection-end="1100" vertical-scroll-proportion="0.0" vertical-offset="561" max-vertical-offset="2652" />
|
||||
@ -762,11 +810,6 @@
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="607" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="22" column="0" selection-start="309" selection-end="465" vertical-scroll-proportion="-1.0481927" vertical-offset="983" max-vertical-offset="1564" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/programme/_search.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.7848537" vertical-offset="456" max-vertical-offset="1037" />
|
||||
@ -787,11 +830,6 @@
|
||||
<state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.0" vertical-offset="320" max-vertical-offset="901" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="4" column="0" selection-start="49" selection-end="75" vertical-scroll-proportion="-0.65384614" vertical-offset="51" max-vertical-offset="1105" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="19" column="25" selection-start="500" selection-end="500" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="680" />
|
||||
@ -824,13 +862,6 @@
|
||||
<state line="2" column="18" selection-start="45" selection-end="45" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="425" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="104" column="5" selection-start="3356" selection-end="3356" vertical-scroll-proportion="3.125" vertical-offset="18" max-vertical-offset="2567">
|
||||
<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="3408" column="27" selection-start="134698" selection-end="134698" vertical-scroll-proportion="-0.18673648" vertical-offset="57924" max-vertical-offset="74018">
|
||||
@ -840,42 +871,31 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/demos/default/protected/views/site/index.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="599">
|
||||
<folding />
|
||||
</state>
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="599" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="22" column="33" selection-start="1131" selection-end="1131" vertical-scroll-proportion="0.118673645" vertical-offset="306" max-vertical-offset="1105">
|
||||
<state line="22" column="33" selection-start="1131" selection-end="1131" vertical-scroll-proportion="0.118673645" vertical-offset="306" max-vertical-offset="1105" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="104" column="5" selection-start="3356" selection-end="3356" vertical-scroll-proportion="2.3053572" vertical-offset="477" max-vertical-offset="2567">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-13.538462" vertical-offset="5" max-vertical-offset="680">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="1751">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-6.5384617" vertical-offset="2040" max-vertical-offset="3111">
|
||||
<state line="22" column="46" selection-start="673" selection-end="673" vertical-scroll-proportion="-11.576923" vertical-offset="73" max-vertical-offset="646">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/framework/web/CController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-1.7692307" vertical-offset="13044" max-vertical-offset="20910">
|
||||
<state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-0.2155797" vertical-offset="13209" max-vertical-offset="20910">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -889,13 +909,66 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="71" column="17" selection-start="2099" selection-end="2099" vertical-scroll-proportion="0.39285713" vertical-offset="987" max-vertical-offset="2312">
|
||||
<state line="44" column="85" selection-start="1413" selection-end="1413" vertical-scroll-proportion="-16.26923" vertical-offset="325" max-vertical-offset="1768">
|
||||
<folding>
|
||||
<marker date="1400836934640" expanded="true" signature="3258:3293" placeholder="..." />
|
||||
<marker date="1401259726860" expanded="true" signature="2456:2491" placeholder="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="35" column="27" selection-start="557" selection-end="557" vertical-scroll-proportion="-13.038462" vertical-offset="256" max-vertical-offset="850">
|
||||
<folding>
|
||||
<element signature="e#6#84#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="58" selection-start="183" selection-end="183" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="1173">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-0.0" vertical-offset="1139" max-vertical-offset="1751">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-9.807693" vertical-offset="102" max-vertical-offset="680">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="19" column="23" selection-start="315" selection-end="315" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="1564">
|
||||
<folding>
|
||||
<marker date="1401262284212" expanded="true" signature="824:847" placeholder="SELECT * FRO..programme..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-34.0" vertical-offset="1326" max-vertical-offset="3111">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="36" column="95" selection-start="908" selection-end="908" vertical-scroll-proportion="0.19927536" vertical-offset="502" max-vertical-offset="1360">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
||||
75
www/protected/components/ProgrammeHelper.php
Normal file
75
www/protected/components/ProgrammeHelper.php
Normal file
@ -0,0 +1,75 @@
|
||||
<?php
|
||||
|
||||
class ProgrammeHelper {
|
||||
|
||||
public static function GetHighlightedProgList($doDelimiter)
|
||||
{
|
||||
$dropDownModels = array();
|
||||
|
||||
$criteria = new CDbCriteria;
|
||||
$criteria->order = "add_date DESC";
|
||||
$criteria->condition = "visible=1 AND enabled=1";
|
||||
$criteria->limit = 3;
|
||||
foreach (Programme::model()->findAll($criteria) as $row) {
|
||||
$dropDownModels[] = $row;
|
||||
}
|
||||
|
||||
if ($doDelimiter)
|
||||
{
|
||||
$dropDownModels[] = null;
|
||||
}
|
||||
|
||||
$criteria = new CDbCriteria;
|
||||
$criteria->order = "add_date DESC";
|
||||
$criteria->limit = 8;
|
||||
$criteria->condition = "Sterne=4 AND visible=1 AND enabled=1";
|
||||
foreach (Programme::model()->findAll($criteria) as $row) {
|
||||
$dropDownModels[] = $row;
|
||||
}
|
||||
|
||||
return $dropDownModels;
|
||||
}
|
||||
|
||||
public static function GetRecentProg()
|
||||
{
|
||||
$criteria = new CDbCriteria;
|
||||
$criteria->order = "add_date DESC";
|
||||
$criteria->condition = "DATEDIFF(CURDATE(), add_date) <= 14 AND visible=1 AND enabled=1";
|
||||
$criteria->limit = 1;
|
||||
|
||||
return Programme::model()->find($criteria);
|
||||
}
|
||||
|
||||
public static function GetDailyProg()
|
||||
{
|
||||
$recent = self::GetRecentProg();
|
||||
|
||||
if ($recent != null)
|
||||
return $recent;
|
||||
|
||||
$toparray = self::GetHighlightedProgList(false);
|
||||
|
||||
$msrand = new SeededRandom();
|
||||
$msrand->seedWithDailySeed();
|
||||
|
||||
$result = $msrand->getRandomElement($toparray);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public static function GetProgDropDownList()
|
||||
{
|
||||
$progDropDown = array();
|
||||
|
||||
$dropDownModels = self::GetHighlightedProgList(true);
|
||||
|
||||
foreach ($dropDownModels as $row) {
|
||||
if (is_null($row))
|
||||
$progDropDown[] = TbHtml::menuDivider();
|
||||
else
|
||||
$progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programme/' . $row->attributes['Name']);
|
||||
}
|
||||
return $progDropDown;
|
||||
}
|
||||
|
||||
}
|
||||
45
www/protected/components/SeededRandom.php
Normal file
45
www/protected/components/SeededRandom.php
Normal file
@ -0,0 +1,45 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: Mike
|
||||
* Date: 28.05.14
|
||||
* Time: 09:15
|
||||
*/
|
||||
|
||||
class SeededRandom
|
||||
{
|
||||
var $RSeed = 0;
|
||||
|
||||
function seed($s = 0)
|
||||
{
|
||||
$this->RSeed = abs(intval($s)) % 9999999 + 1;
|
||||
$this->get();
|
||||
}
|
||||
|
||||
function seedWithDailySeed()
|
||||
{
|
||||
$this->seed($this->getDailySeed());
|
||||
}
|
||||
|
||||
function get($min = 0, $max = 9999999)
|
||||
{
|
||||
if ($this->RSeed == 0)
|
||||
$this->seed(mt_rand());
|
||||
|
||||
$this->RSeed = ($this->RSeed * 125) % 2796203;
|
||||
|
||||
return $this->RSeed % ($max - $min + 1) + $min;
|
||||
}
|
||||
|
||||
function getRandomElement(array $arr)
|
||||
{
|
||||
return $arr[$this->get(0, count($arr))];
|
||||
}
|
||||
|
||||
function getDailySeed()
|
||||
{
|
||||
$now = getdate();
|
||||
|
||||
return ($now['year'] % 100) * 366 + $now['yday'];
|
||||
}
|
||||
}
|
||||
@ -20,7 +20,7 @@ class UserIdentity extends CUserIdentity
|
||||
$users=array(
|
||||
// username => password
|
||||
'demo'=>'demo',
|
||||
'admin'=>'admin',
|
||||
'admin'=>'admin', //TODO Change me
|
||||
);
|
||||
if(!isset($users[$this->username]))
|
||||
$this->errorCode=self::ERROR_USERNAME_INVALID;
|
||||
|
||||
@ -6,7 +6,11 @@ class SiteController extends Controller
|
||||
|
||||
public function actionIndex()
|
||||
{
|
||||
$this->render('index');
|
||||
$data = array();
|
||||
|
||||
$data['program'] = ProgrammeHelper::GetDailyProg();
|
||||
|
||||
$this->render('index', $data);
|
||||
}
|
||||
|
||||
public function actionError()
|
||||
|
||||
@ -1,35 +1,3 @@
|
||||
<?php // ###### FUNCTIONS ######
|
||||
function GetProgDropDownList()
|
||||
{
|
||||
$progDropDown = array();
|
||||
$dropDownModels = array();
|
||||
|
||||
$criteria = new CDbCriteria;
|
||||
$criteria->order = "add_date DESC";
|
||||
$criteria->limit = 3;
|
||||
foreach (Programme::model()->findAll($criteria) as $row) {
|
||||
$dropDownModels[] = $row;
|
||||
}
|
||||
$dropDownModels[] = null;
|
||||
|
||||
$criteria = new CDbCriteria;
|
||||
$criteria->order = "add_date DESC";
|
||||
$criteria->limit = 8;
|
||||
$criteria->condition = "Sterne=4 AND visible=1";
|
||||
foreach (Programme::model()->findAll($criteria) as $row) {
|
||||
$dropDownModels[] = $row;
|
||||
}
|
||||
|
||||
foreach ($dropDownModels as $row) {
|
||||
if (is_null($row))
|
||||
$progDropDown[] = TbHtml::menuDivider();
|
||||
else
|
||||
$progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programme/' . $row->attributes['Name']);
|
||||
}
|
||||
return $progDropDown;
|
||||
}
|
||||
?>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<!--[if lt IE 7]>
|
||||
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
|
||||
@ -77,7 +45,7 @@ function GetProgDropDownList()
|
||||
['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
|
||||
['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
|
||||
['label' => 'Programme', 'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')],
|
||||
['label' => '', 'items' => GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
|
||||
['label' => '', 'items' => ProgrammeHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
|
||||
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
|
||||
],
|
||||
],
|
||||
|
||||
@ -17,7 +17,7 @@ $this->selectedNav = 'index';
|
||||
<!-- Main hero unit for a primary marketing message or call to action -->
|
||||
<div class="hero-unit">
|
||||
<h1>Hello, world!</h1>
|
||||
|
||||
Daily Program: <?php echo $program->Name; ?>
|
||||
<p>
|
||||
|
||||
<ul>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user