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

Added initial Design for CollapsedHeader (index page)

Browse Source
This commit is contained in:
Mike Schwörer 2014-06-04 13:33:57 +02:00
parent 5b2a5bec36
commit fc21232523
4 changed files with 162 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
.idea/workspace.xml
View File

@ -63,28 +63,51 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="MSMainController.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/controllers/MSMainController.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="4" column="0" selection-start="53" selection-end="53" vertical-scroll-proportion="0.07631874" vertical-offset="0" max-vertical-offset="1887"> <state line="81" column="15" selection-start="2089" selection-end="2089" vertical-scroll-proportion="-11.384615" vertical-offset="1081" max-vertical-offset="2108">
<folding>
<marker date="1401881587072" expanded="true" signature="824:850" placeholder="SELECT * FRO..." />
</folding>
</state>
</provider>
</entry>
</file>
<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">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ProgramsController.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="MsHtml.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="5" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="-3.2692308" vertical-offset="0" max-vertical-offset="3689"> <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>
</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">
<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">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MSController.php" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php"> <entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="510"> <state line="176" column="18" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.0" vertical-offset="2126" max-vertical-offset="3111">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -134,7 +157,6 @@
<option value="$PROJECT_DIR$/www/index.php" /> <option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" /> <option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
<option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" /> <option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" /> <option value="$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php" />
<option value="$PROJECT_DIR$/www/protected/components/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/views/programs/index.php" />
@ -150,6 +172,9 @@
<option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.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/components/MSController.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/MSMainController.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/components/MsHtml.php" />
</list> </list>
</option> </option>
</component> </component>
@ -514,24 +539,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="javascript" />
<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" />
@ -550,20 +557,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="framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope"> <pane id="Scope">
@ -765,11 +758,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/demos/default/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="74" column="0" selection-start="1876" selection-end="2673" vertical-scroll-proportion="-2.6153846" vertical-offset="1190" max-vertical-offset="1938" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/demos/default/protected/models/LoginForm.php"> <entry file="file://$PROJECT_DIR$/demos/default/protected/models/LoginForm.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="21.576923" vertical-offset="561" max-vertical-offset="1411" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="21.576923" vertical-offset="561" max-vertical-offset="1411" />
@ -887,7 +875,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/ThumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor"> <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" /> <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> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
@ -900,23 +890,11 @@
<state line="48" column="16" selection-start="1014" selection-end="1040" vertical-scroll-proportion="0.0" vertical-offset="816" max-vertical-offset="1666" /> <state line="48" column="16" selection-start="1014" selection-end="1040" vertical-scroll-proportion="0.0" vertical-offset="816" max-vertical-offset="1666" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.php">
<provider selected="true" editor-type-id="text-editor">
<state line="68" column="76" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.6718213" vertical-offset="765" max-vertical-offset="1377" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/behaviors/TbWidget.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/behaviors/TbWidget.php">
<provider selected="true" editor-type-id="text-editor"> <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" /> <state line="43" column="11" selection-start="1115" selection-end="1115" vertical-scroll-proportion="-7.769231" vertical-offset="427" max-vertical-offset="2856" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="2906" column="19" selection-start="114917" selection-end="114917" vertical-scroll-proportion="-7.4615383" vertical-offset="49089" max-vertical-offset="74018">
<folding />
</state>
</provider>
</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="2102" column="24" selection-start="64541" selection-end="64541" vertical-scroll-proportion="-7.4615383" vertical-offset="35540" max-vertical-offset="66963" /> <state line="2102" column="24" selection-start="64541" selection-end="64541" vertical-scroll-proportion="-7.4615383" vertical-offset="35540" max-vertical-offset="66963" />
@ -939,11 +917,6 @@
<state line="45" column="11" selection-start="1058" selection-end="1058" vertical-scroll-proportion="-11.615385" vertical-offset="361" max-vertical-offset="969" /> <state line="45" column="11" selection-start="1058" selection-end="1058" vertical-scroll-proportion="-11.615385" vertical-offset="361" max-vertical-offset="969" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="147" column="1" selection-start="2730" selection-end="2730" vertical-scroll-proportion="1.5581014" vertical-offset="1547" max-vertical-offset="2601" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/.gitignore"> <entry file="file://$PROJECT_DIR$/www/protected/config/env/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <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"> <state line="0" column="2" selection-start="2" selection-end="2" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="611">
@ -958,15 +931,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="16" selection-start="782" selection-end="782" vertical-scroll-proportion="0.43883276" vertical-offset="306" max-vertical-offset="1564">
<folding>
<marker date="1401866608765" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/Program.php"> <entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="57" column="38" selection-start="2104" selection-end="2104" vertical-scroll-proportion="-1.7059538" vertical-offset="2373" max-vertical-offset="3196"> <state line="57" column="38" selection-start="2104" selection-end="2104" vertical-scroll-proportion="-1.7059538" vertical-offset="2373" max-vertical-offset="3196">
@ -1048,27 +1012,67 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="-12.423077" vertical-offset="0" max-vertical-offset="510"> <state line="4" column="0" selection-start="53" selection-end="53" vertical-scroll-proportion="0.07631874" vertical-offset="0" max-vertical-offset="1887">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="5" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="-3.2692308" vertical-offset="0" max-vertical-offset="3689"> <state line="5" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.095398426" vertical-offset="0" max-vertical-offset="3689">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php">
<provider selected="true" editor-type-id="text-editor"> <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"> <state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="0.36251402" vertical-offset="0" max-vertical-offset="891">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<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">
<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">
<folding>
<marker date="1401881587072" expanded="true" signature="824:850" placeholder="SELECT * FRO..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/views/thumbnailPreview.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">
<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">
<folding>
<marker date="1401881611056" expanded="true" signature="139:355" placeholder="..." />
<marker date="1401881611056" expanded="true" signature="139:177" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

30
www/css/styles.css
View File

@ -146,3 +146,33 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
.thumbnailParentSpan .caption h6 { .thumbnailParentSpan .caption h6 {
text-align: center; text-align: center;
} }
/* CollHeader
-------------------------------------------------- */
.collHeader {
border: 1px solid #D7E0E2;
padding: 0;
}
.collHeaderSpan-front {
float: left;
background-color: #D7E0E2;
width: 90px;
padding: 2px 15px;
}
.collHeaderSpan {
float: left;
font-weight: bold;
padding: 2px 10px;
}
.collHeaderSpan-drop {
float: right;
padding: 0 5px;
margin-top: 2px;
}

13
www/protected/components/MsHtml.php Normal file
View File

@ -0,0 +1,13 @@
<?php
class MsHtml extends CHtml {
public static function collapsedHeader($date, $caption)
{
return
'<div class="well 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>
';
}
}

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

@ -79,9 +79,41 @@ $this->selectedNav = 'index';
</div> </div>
</div> </div>
<hr> <?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<footer> <div class="well row collHeader">
<p>&copy; Company 2012</p> <div class="collHeaderSpan-front">24.07.1999</div>
</footer> <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> </div>