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

Added FullProgPreview to Indexpage

Browse Source
This commit is contained in:
Mike Schwörer 2014-06-04 18:06:38 +02:00
parent fc21232523
commit 12b6a3359e
14 changed files with 436 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

344
.idea/workspace.xml generated
View File

@ -2,13 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/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/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<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/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
</list>
<ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" />
@ -66,9 +66,10 @@
<file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="81" column="15" selection-start="2089" selection-end="2089" vertical-scroll-proportion="-11.384615" vertical-offset="1081" max-vertical-offset="2108">
<state line="20" column="34" selection-start="300" selection-end="315" vertical-scroll-proportion="-9.423077" vertical-offset="95" max-vertical-offset="1649">
<folding>
<marker date="1401881587072" expanded="true" signature="824:850" placeholder="SELECT * FRO..." />
<marker date="1401896604418" expanded="true" signature="1112:1199" placeholder="..." />
<marker date="1401896604418" expanded="true" signature="1201:1227" placeholder="SELECT * FRO..." />
</folding>
</state>
</provider>
@ -77,28 +78,43 @@
<file leaf-file-name="TbHtml.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="460" column="0" selection-start="15867" selection-end="15991" vertical-scroll-proportion="174.57692" vertical-offset="12240" max-vertical-offset="74018">
<state line="2722" column="27" selection-start="107384" selection-end="107384" vertical-scroll-proportion="-5.8461537" vertical-offset="46003" max-vertical-offset="74018">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MsHtml.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<file leaf-file-name="fullProgPreview.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="72" selection-start="204" selection-end="204" vertical-scroll-proportion="0.11447811" vertical-offset="0" max-vertical-offset="891">
<folding>
<marker date="1401881611056" expanded="true" signature="139:355" placeholder="..." />
<marker date="1401881611056" expanded="true" signature="139:177" placeholder="..." />
</folding>
<state line="67" column="20" selection-start="1357" selection-end="1357" vertical-scroll-proportion="0.82042646" vertical-offset="408" max-vertical-offset="1309">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="thumbnailPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<file leaf-file-name="Program.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="65" column="81" selection-start="1775" selection-end="1790" vertical-scroll-proportion="-24.807692" vertical-offset="460" max-vertical-offset="1377">
<state line="164" column="73" selection-start="5845" selection-end="5845" vertical-scroll-proportion="-18.076923" vertical-offset="2318" max-vertical-offset="3196">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProgramHelper.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="27" selection-start="1525" selection-end="1525" vertical-scroll-proportion="-18.26923" vertical-offset="715" max-vertical-offset="1717">
<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="42" column="61" selection-start="683" selection-end="683" vertical-scroll-proportion="-24.192308" vertical-offset="0" max-vertical-offset="765">
<folding />
</state>
</provider>
@ -107,7 +123,16 @@
<file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="176" column="18" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.0" vertical-offset="2126" max-vertical-offset="3111">
<state line="247" column="1" selection-start="4336" selection-end="4336" vertical-scroll-proportion="0.0" vertical-offset="3384" max-vertical-offset="4301">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="thumbnailProgPreview.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="20" selection-start="1382" selection-end="1576" vertical-scroll-proportion="-25.5" vertical-offset="204" max-vertical-offset="1394">
<folding />
</state>
</provider>
@ -126,9 +151,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/www/protected/models/SendMailForm.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/column-2.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" />
<option value="$PROJECT_DIR$/www/protected/views/programme/create.php" />
<option value="$PROJECT_DIR$/www/protected/views/programme/update.php" />
<option value="$PROJECT_DIR$/www/protected/views/programme/view.php" />
@ -155,26 +177,31 @@
<option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/debugerror.php" />
<option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret" />
<option value="$PROJECT_DIR$/www/protected/config/env/.gitignore" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret.php" />
<option value="$PROJECT_DIR$/www/protected/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.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/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/components/MSController.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/index.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
<option value="$PROJECT_DIR$/www/protected/components/MsHtml.php" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/FullPreview.php" />
<option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/thumbnailProgPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/FullProgPreview.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/models/Program.php" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/widgets/views/fullProgPreview.php" />
</list>
</option>
</component>
@ -534,6 +561,36 @@
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="widgets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="widgets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@ -592,10 +649,15 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets\views" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\views\site" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\models" />
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\css" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\Eigene Dateien\Dropbox\Programming\Web\Mikescher.de\www.mikescher.de\www\protected\components\widgets" />
</key>
</component>
<component name="RunManager" selected="PHP HTTP Request.www.mikescher.de - Index">
<configuration default="false" name="index.php" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true" temporary="true" uri="http://localhost:63342/www.mikescher.de/www/index.php">
@ -722,15 +784,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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3244963" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22479339" 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.22699724" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="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="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="UnknownFeatures">
@ -758,21 +820,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/demos/default/protected/models/LoginForm.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="21.576923" vertical-offset="561" max-vertical-offset="1411" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="138" selection-start="1532" selection-end="1750" vertical-scroll-proportion="-11.115385" vertical-offset="306" max-vertical-offset="1105" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/LoginForm.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="25.5" vertical-offset="663" max-vertical-offset="1411" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="27" selection-start="804" selection-end="804" vertical-scroll-proportion="-11.807693" vertical-offset="135" max-vertical-offset="714" />
@ -858,38 +905,16 @@
<state line="9" column="58" selection-start="368" selection-end="371" vertical-scroll-proportion="-5.8846154" vertical-offset="0" max-vertical-offset="323" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="45" selection-start="571" selection-end="571" vertical-scroll-proportion="0.0" vertical-offset="595" max-vertical-offset="850" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/db/ar/CActiveRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1465" column="20" selection-start="52155" selection-end="52155" vertical-scroll-proportion="0.33333334" vertical-offset="24596" max-vertical-offset="41395" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="90" column="82" selection-start="1955" selection-end="1955" vertical-scroll-proportion="0.0" vertical-offset="1135" max-vertical-offset="1717" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="0" selection-start="414" selection-end="414" vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="493">
<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="102" selection-start="2202" selection-end="2235" vertical-scroll-proportion="0.0" vertical-offset="294" max-vertical-offset="1785" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="48" column="16" selection-start="1014" selection-end="1040" vertical-scroll-proportion="0.0" vertical-offset="816" max-vertical-offset="1666" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/behaviors/TbWidget.php">
<provider selected="true" editor-type-id="text-editor">
<state line="43" column="11" selection-start="1115" selection-end="1115" vertical-scroll-proportion="-7.769231" vertical-offset="427" max-vertical-offset="2856" />
@ -907,9 +932,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNav.php">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="7" selection-start="1605" selection-end="1605" vertical-scroll-proportion="-7.769231" vertical-offset="597" max-vertical-offset="2907">
<folding />
</state>
<state line="53" column="7" selection-start="1605" selection-end="1605" vertical-scroll-proportion="-7.769231" vertical-offset="597" max-vertical-offset="2907" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbScrollspy.php">
@ -919,23 +942,12 @@
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="2" selection-start="2" selection-end="2" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="611">
<folding />
</state>
<state line="0" column="2" selection-start="2" selection-end="2" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="611" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/database-access.secret.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="72" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="238">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="38" selection-start="2104" selection-end="2104" vertical-scroll-proportion="-1.7059538" vertical-offset="2373" max-vertical-offset="3196">
<folding />
</state>
<state line="5" column="72" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="238" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/web/CBaseController.php">
@ -952,32 +964,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="73" column="57" selection-start="1647" selection-end="1647" vertical-scroll-proportion="-24.461538" vertical-offset="605" max-vertical-offset="1853">
<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="19" column="44" selection-start="461" selection-end="461" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="850">
<folding />
</state>
<state line="19" column="44" selection-start="461" selection-end="461" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="850" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/prod.php">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="33" selection-start="584" selection-end="584" vertical-scroll-proportion="0.5151515" vertical-offset="0" max-vertical-offset="891">
<folding />
</state>
<state line="27" column="33" selection-start="584" selection-end="584" vertical-scroll-proportion="0.5151515" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/cli/views/webapp/hg-hgignore">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="917">
<folding />
</state>
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="917" />
</provider>
</entry>
<entry file="uml://PHP/\Yii">
@ -991,9 +990,10 @@
</nodes>
<notes />
<edges />
<settings layout="Hierarchic Group" zoom="1.0" x="32.5" y="52.0" />
<settings layout="Hierarchic Group" zoom="1.0" x="33.0" y="52.0" />
<SelectedNodes />
<Categories />
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</state>
</provider>
@ -1012,20 +1012,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="0" selection-start="53" selection-end="53" vertical-scroll-proportion="0.07631874" vertical-offset="0" max-vertical-offset="1887">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.095398426" vertical-offset="0" max-vertical-offset="3689">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="0.36251402" vertical-offset="0" max-vertical-offset="891">
@ -1033,46 +1019,130 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php">
<provider selected="true" editor-type-id="text-editor">
<state line="176" column="18" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.0" vertical-offset="2126" max-vertical-offset="3111">
<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="460" column="0" selection-start="15867" selection-end="15991" vertical-scroll-proportion="174.57692" vertical-offset="12240" max-vertical-offset="74018">
<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="81" column="15" selection-start="2089" selection-end="2089" vertical-scroll-proportion="-11.384615" vertical-offset="1081" max-vertical-offset="2108">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="917">
<folding>
<marker date="1401881587072" expanded="true" signature="824:850" placeholder="SELECT * FRO..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="false" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="false" signature="-1:-1" placeholder="..." />
<marker date="1400487246818" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="65" column="81" selection-start="1775" selection-end="1790" vertical-scroll-proportion="-24.807692" vertical-offset="460" max-vertical-offset="1377">
<state line="7" column="25" selection-start="116" selection-end="116" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="3723">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="72" selection-start="204" selection-end="204" vertical-scroll-proportion="0.11447811" vertical-offset="0" max-vertical-offset="891">
<state line="21" column="29" selection-start="549" selection-end="549" vertical-scroll-proportion="-13.730769" vertical-offset="0" max-vertical-offset="629">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="8" column="48" selection-start="149" selection-end="149" vertical-scroll-proportion="-5.230769" vertical-offset="0" max-vertical-offset="1887">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="48" selection-start="778" selection-end="778" vertical-scroll-proportion="-17.923077" vertical-offset="78" max-vertical-offset="1870">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/ThumbnailProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="19" selection-start="26" selection-end="26" vertical-scroll-proportion="-1.3076923" vertical-offset="0" max-vertical-offset="493">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="50" column="0" selection-start="1042" selection-end="1572" vertical-scroll-proportion="-7.8076925" vertical-offset="647" max-vertical-offset="1666">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/widgets/FullProgPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="8" column="38" selection-start="137" selection-end="137" vertical-scroll-proportion="0.15263748" vertical-offset="0" max-vertical-offset="891">
<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="20" column="34" selection-start="300" selection-end="315" vertical-scroll-proportion="-9.423077" vertical-offset="95" max-vertical-offset="1649">
<folding>
<marker date="1401881611056" expanded="true" signature="139:355" placeholder="..." />
<marker date="1401881611056" expanded="true" signature="139:177" placeholder="..." />
<marker date="1401896604418" expanded="true" signature="1112:1199" placeholder="..." />
<marker date="1401896604418" expanded="true" signature="1201:1227" placeholder="SELECT * FRO..." />
</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="2722" column="27" selection-start="107384" selection-end="107384" vertical-scroll-proportion="-5.8461537" vertical-offset="46003" max-vertical-offset="74018">
<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="51" column="20" selection-start="1382" selection-end="1576" vertical-scroll-proportion="-25.5" vertical-offset="204" max-vertical-offset="1394">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="247" column="1" selection-start="4336" selection-end="4336" vertical-scroll-proportion="0.0" vertical-offset="3384" max-vertical-offset="4301">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor">
<state line="164" column="73" selection-start="5845" selection-end="5845" vertical-scroll-proportion="-18.076923" vertical-offset="2318" max-vertical-offset="3196">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="27" selection-start="1525" selection-end="1525" vertical-scroll-proportion="-18.26923" vertical-offset="715" max-vertical-offset="1717">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/SeededRandom.php">
<provider selected="true" editor-type-id="text-editor">
<state line="42" column="61" selection-start="683" selection-end="683" vertical-scroll-proportion="-24.192308" vertical-offset="0" max-vertical-offset="765">
<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="67" column="20" selection-start="1357" selection-end="1357" vertical-scroll-proportion="0.82042646" vertical-offset="408" max-vertical-offset="1309">
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

1
DB_Changes.txt
View File

@ -5,3 +5,4 @@ programme -> Added Column programming_lang
programme -> Changed Sieb_des_Erasthothenes -> Sieb des Erasthothenes (also ren Imagefiles)
programme -> Adjusted Star Ratings
programme -> Niripsa[visible] = 0
programme -> ms4_programs

70
www/css/styles.css
View File

@ -153,6 +153,28 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
.collHeader {
border: 1px solid #D7E0E2;
padding: 0;
margin-left: 0;
position: relative;
/* .well */
min-height: 20px;
box-shadow: none;
border-radius: 6px;
background-color: #ECF0F1;
margin-bottom: 20px;
}
.collHeaderLinkParent {
background-color: #ECF0F1;
transition: background-color .25s ease-in-out;
-moz-transition: background-color .25s ease-in-out;
-webkit-transition: background-color .25s ease-in-out;
}
.collHeaderLinkParent:hover {
background-color: #D7E0E2;
}
.collHeaderSpan-front {
@ -176,3 +198,51 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
padding: 0 5px;
margin-top: 2px;
}
.collHeaderLink {
left: 0;
top: 0;
width: 100%;
height: 100%;
position: absolute;
}
/* FullProgPreview
-------------------------------------------------- */
.fpp_parent {
background-color: #D7E0E2;
}
.fpp_previewImg {
width: 260px;
border-radius: 6px;
box-shadow: 0 0 15px 0px #333;
}
.fpp_title {
margin-top: -5px;
}
.fpp_description {
max-width: 260px
}
.fpp_footer {
background-color: #ECF0F1;
margin-left: -19px;
margin-right: -19px;
margin-bottom: -19px;
padding-top: 19px;
padding-left: 19px;
padding-right: 19px;
border: 2px solid #D7E0E2;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}

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

@ -1,13 +1,32 @@
<?php
class MsHtml extends CHtml {
public static function collapsedHeader($date, $caption)
/**
* @param DateTime $date
* @param string $caption
* @param string $link
* @return string
*/
public static function collapsedHeader($date, $caption, $link = '')
{
if (empty($link)) {
return
'<div class="well row collHeader">
<div class="collHeaderSpan-front">' . $date->format('d.m.y') . '</div>
'<div class="row collHeader">
<div class="collHeaderSpan-front">' . $date->format('d.m.Y') . '</div>
<div class="collHeaderSpan">' . $caption . '</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
';
} else {
return
'<div class="row collHeader collHeaderLinkParent">
<div class="collHeaderSpan-front">' . $date->format('d.m.Y') . '</div>
<div class="collHeaderSpan">' . $caption . '</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
<a class="collHeaderLink" href="' . $link . '">&nbsp;</a>
</div>
';
}
}
}

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

@ -40,6 +40,6 @@ class SeededRandom
{
$now = getdate();
return ($now['year'] % 100) * 366 + $now['yday'];
return ($now['year'] % 100) * 366 + $now['yday'] /* * $now['seconds'] */;
}
}

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

@ -0,0 +1,16 @@
<?php
class FullProgPreview extends CWidget {
/**
* @var $program Program
*/
public $program;
public $caption = ' ?? caption ?? ';
public function run() {
$this->render('fullProgPreview');
}
}
?>

4
www/protected/components/ThumbnailPreview.php → www/protected/components/widgets/ThumbnailProgPreview.php
View File

@ -1,6 +1,6 @@
<?php
class ThumbnailPreview extends CWidget {
class ThumbnailProgPreview extends CWidget {
public $caption = '';
public $link = '';
public $enabled = true;
@ -17,7 +17,7 @@ class ThumbnailPreview extends CWidget {
if ($this->date == null)
$this->date = new DateTime('2000-01-01');
$this->render('thumbnailPreview');
$this->render('thumbnailProgPreview');
}
}

72
www/protected/components/widgets/views/fullProgPreview.php Normal file
View File

@ -0,0 +1,72 @@
<?php
/* @var $this FullProgPreview */
?>
<div class="well fpp_parent">
<div class="container">
<h1> <?php echo $this->caption; ?> </h1>
<br />
<div class="row">
<div class="span3">
<a href="<?php echo $this->program->getLink(); ?>">
<img class="fpp_previewImg" src="<?php echo $this->program->getImagePath(); ?>"/>
</a>
</div>
<div class="span9">
<div>
<h2 class="fpp_title">
<?php echo $this->program->Name; ?>
<?php
for ($i = 0; $i < 4; $i++) {
if ($i < $this->program->Sterne)
echo TbHtml::icon(TbHtml::ICON_STAR);
else
echo TbHtml::icon(TbHtml::ICON_STAR_EMPTY);
}
?>
</h2>
</div>
<p class="fpp_description">
<?php echo $this->program->Description; ?>
</p>
<p>
<?php
if (!empty($this->program->Kategorie)) {
echo TbHtml::icon(TbHtml::ICON_TAG);
echo $this->program->Kategorie . '';
}
?>
</p>
<p>
<?php
foreach ($this->program->getLanguageList() as $lang) {
echo TbHtml::icon(TbHtml::ICON_GLOBE);
echo $lang;
echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
}
?>
</p>
</div>
</div>
</div>
<br />
<div class="fpp_footer">
<p>
<a class="btn btn-primary btn-large" href="<?php echo $this->program->getLink(); ?>">
Show &raquo;
</a>
</p>
</div>
</div>

3
www/protected/components/views/thumbnailPreview.php → www/protected/components/widgets/views/thumbnailProgPreview.php
View File

@ -1,5 +1,5 @@
<?php
/* @var $this ThumbnailPreview */
/* @var $this ThumbnailProgPreview */
?>
<li class="thumbnailParentSpan">
@ -45,6 +45,7 @@
echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
}
?>
</p>
</div>
<div class="modal-footer thumbnailInnerFooter">
<div class="text-center">

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

@ -30,6 +30,7 @@ return ArrayX::merge(
[
'application.models.*',
'application.components.*',
'application.components.widgets.*',
'bootstrap.components.*',
'bootstrap.behaviors.*',
'bootstrap.helpers.*',

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

@ -5,6 +5,8 @@ class ProgramsController extends MSController
public $layout='//layouts/column2';
public $menu=array();
/**
* @return array action filters
*/

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

@ -161,8 +161,8 @@ class Program extends CActiveRecord
public function getImagePath() {
if (file_exists('images/programs/thumbnails/' . $this->Name . '.png'))
return '/images/programs/thumbnails/' . $this->Name . '.png';
else if (file_exists('images/programs/thumbnails/' . $this->Name . '.jpg'))
return '/images/programs/thumbnails/' . $this->Name . '.jpg'; //TODO-MS REM ME - never use jpg
// else if (file_exists('images/programs/thumbnails/' . $this->Name . '.jpg'))
// return '/images/programs/thumbnails/' . $this->Name . '.jpg';
else throw new CHttpException(500, "Could not find Program Thumbnail '" . $this->Name . "'");
}

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

@ -1,5 +1,6 @@
<?php
/* @var $this SiteController */
/* @var $program Program */
$this->pageTitle=Yii::app()->name;
@ -15,20 +16,30 @@ $this->selectedNav = 'index';
<div class="container">
<!-- 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>
<li>View file: <code><?php echo __FILE__; ?></code></li>
<li>Layout file: <code><?php echo $this->getLayoutFile('main'); ?></code></li>
</ul>
<?php
$this->widget('FullProgPreview',
[
'caption' => "Program of the Day:",
'program' => $program,
]);
?>
</p>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World", "/log/1"); ?>
<p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
</div>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<!-- Example row of columns -->
<div class="row">
@ -78,42 +89,4 @@ $this->selectedNav = 'index';
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
<div class="well row collHeader">
<div class="collHeaderSpan-front">24.07.1999</div>
<div class="collHeaderSpan">Die neue Websiste ist online</div>
<div class="collHeaderSpan-drop"> <i class="icon-chevron-down" ></i> </div>
</div>
</div>

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

@ -48,7 +48,7 @@
foreach (array_slice($all, $i * PROGS_INDEX_ROWSIZE, PROGS_INDEX_ROWSIZE) as $record) {
/* @var $record Program */
$this->widget('ThumbnailPreview',
$this->widget('ThumbnailProgPreview',
[
'caption' => $record->Thumbnailname,
'link' => $record->getLink(),