1
0

Improved ExtendedGitGraph Design in /about

This commit is contained in:
Mike Schwörer 2014-06-08 15:31:44 +02:00
parent 02aa4a2cf4
commit 2f5c31b696
4 changed files with 213 additions and 94 deletions

184
.idea/workspace.xml generated
View File

@ -3,12 +3,12 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment=""> <list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.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/www.mikescher.de.iml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
</list> </list>
<ignored path="www.mikescher.de.iws" /> <ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -62,7 +62,26 @@
</favorites_list> </favorites_list>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf /> <leaf>
<file leaf-file-name="admin_updateEGH.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="0" selection-start="120" selection-end="120" vertical-scroll-proportion="-3.2692308" vertical-offset="0" max-vertical-offset="272">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extendedGitGraph.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php">
<provider selected="true" editor-type-id="text-editor">
<state line="43" column="5" selection-start="1264" selection-end="1264" vertical-scroll-proportion="1.4166666" vertical-offset="0" max-vertical-offset="8483">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
<FindUsagesManager> <FindUsagesManager>
@ -75,7 +94,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret" /> <option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret" />
<option value="$PROJECT_DIR$/www/protected/config/env/.gitignore" /> <option value="$PROJECT_DIR$/www/protected/config/env/.gitignore" />
<option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret.php" /> <option value="$PROJECT_DIR$/www/protected/config/env/database-access.secret.php" />
@ -106,7 +124,6 @@
<option value="$PROJECT_DIR$/www/protected/views/msmain/log.php" /> <option value="$PROJECT_DIR$/www/protected/views/msmain/log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/index.php" /> <option value="$PROJECT_DIR$/www/protected/views/log/index.php" />
<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/UserIdentity.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php" /> <option value="$PROJECT_DIR$/www/protected/views/log/_ajaxMarkdownPreview.php" />
<option value="$PROJECT_DIR$/www/protected/models/Log.php" /> <option value="$PROJECT_DIR$/www/protected/models/Log.php" />
<option value="$PROJECT_DIR$/www/protected/views/log/_form.php" /> <option value="$PROJECT_DIR$/www/protected/views/log/_form.php" />
@ -117,15 +134,17 @@
<option value="$PROJECT_DIR$/www/egh.php" /> <option value="$PROJECT_DIR$/www/egh.php" />
<option value="$PROJECT_DIR$/www/extendedGitGraph.php" /> <option value="$PROJECT_DIR$/www/extendedGitGraph.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" /> <option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php" />
<option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" /> <option value="$PROJECT_DIR$/www/protected/views/layouts/main.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/protected/data/.gitignore" />
<option value="$PROJECT_DIR$/www/css/styles.css" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/about.php" /> <option value="$PROJECT_DIR$/www/protected/views/msmain/about.php" />
<option value="$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php" /> <option value="$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin.php" /> <option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
<option value="$PROJECT_DIR$/www/protected/data/.gitignore" /> <option value="$PROJECT_DIR$/www/protected/components/MsHelper.php" />
<option value="$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php" />
</list> </list>
</option> </option>
</component> </component>
@ -620,7 +639,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="55" y="-8" width="1873" height="1096" extended-state="6" /> <frame x="55" y="-8" width="1873" height="1096" extended-state="6" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" />
@ -628,20 +647,20 @@
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2429752" 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.24573003" 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.3972311" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39638683" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3244963" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3244963" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" /> <window_info id="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694355" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694355" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@ -665,15 +684,10 @@
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
</breakpoints-dialog> </breakpoints-dialog>
<option name="time" value="30" /> <option name="time" value="31" />
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbButtonColumn.php">
<provider selected="true" editor-type-id="text-editor">
<state line="78" column="29" selection-start="2791" selection-end="2791" vertical-scroll-proportion="-11.115385" vertical-offset="918" max-vertical-offset="1479" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbCollapse.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbCollapse.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="68" column="13" selection-start="1981" selection-end="1981" vertical-scroll-proportion="-9.961538" vertical-offset="795" max-vertical-offset="1377" /> <state line="68" column="13" selection-start="1981" selection-end="1981" vertical-scroll-proportion="-9.961538" vertical-offset="795" max-vertical-offset="1377" />
@ -844,11 +858,6 @@
<state line="35" column="25" selection-start="774" selection-end="774" vertical-scroll-proportion="0.67080045" vertical-offset="0" max-vertical-offset="3417" /> <state line="35" column="25" selection-start="774" selection-end="774" vertical-scroll-proportion="0.67080045" vertical-offset="0" max-vertical-offset="3417" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="6" selection-start="12" selection-end="12" vertical-scroll-proportion="-0.43742955" vertical-offset="405" max-vertical-offset="1292" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/log/admin.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/log/admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="28" column="0" selection-start="537" selection-end="558" vertical-scroll-proportion="-18.307692" vertical-offset="0" max-vertical-offset="1071" /> <state line="28" column="0" selection-start="537" selection-end="558" vertical-scroll-proportion="-18.307692" vertical-offset="0" max-vertical-offset="1071" />
@ -859,46 +868,19 @@
<state line="31" column="4" selection-start="945" selection-end="962" vertical-scroll-proportion="0.43771043" vertical-offset="18" max-vertical-offset="1360" /> <state line="31" column="4" selection-start="945" selection-end="962" vertical-scroll-proportion="0.43771043" vertical-offset="18" max-vertical-offset="1360" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="34" selection-start="212" selection-end="212" vertical-scroll-proportion="0.1335578" vertical-offset="0" max-vertical-offset="891" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="1637" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1615">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/data/disclaimer.php"> <entry file="file://$PROJECT_DIR$/www/protected/data/disclaimer.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php"> <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="34" column="56" selection-start="875" selection-end="875" vertical-scroll-proportion="0.65163475" vertical-offset="0" max-vertical-offset="1972"> <state line="34" column="56" selection-start="875" selection-end="875" vertical-scroll-proportion="0.65163475" vertical-offset="0" max-vertical-offset="1972" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="409" column="1" selection-start="7325" selection-end="7325" vertical-scroll-proportion="0.0" vertical-offset="6703" max-vertical-offset="7616">
<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">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="55" column="52" selection-start="2182" selection-end="2182" vertical-scroll-proportion="-4.8461537" vertical-offset="809" max-vertical-offset="1836"> <state line="55" column="52" selection-start="2182" selection-end="2182" vertical-scroll-proportion="-4.8461537" vertical-offset="809" max-vertical-offset="1836" />
<folding>
<marker date="1402162820506" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php"> <entry file="file://$PROJECT_DIR$/www/protected/components/MSController.php">
@ -908,51 +890,85 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php">
<provider selected="true" editor-type-id="text-editor">
<state line="12" column="59" selection-start="296" selection-end="296" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="306">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/MSMainController.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="77" column="99" selection-start="1517" selection-end="1517" vertical-scroll-proportion="20.153847" vertical-offset="1833" max-vertical-offset="2720"> <state line="77" column="99" selection-start="1517" selection-end="1517" vertical-scroll-proportion="20.153847" vertical-offset="1833" max-vertical-offset="2720" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="0" selection-start="1086" selection-end="1086" vertical-scroll-proportion="0.89299613" vertical-offset="204" max-vertical-offset="1598">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="10" selection-start="759" selection-end="759" vertical-scroll-proportion="-8.538462" vertical-offset="50" max-vertical-offset="4726">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/data/.gitignore"> <entry file="file://$PROJECT_DIR$/www/protected/data/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1" column="12" selection-start="38" selection-end="38" vertical-scroll-proportion="0.031481482" vertical-offset="0" max-vertical-offset="540"> <state line="1" column="12" selection-start="38" selection-end="38" vertical-scroll-proportion="0.031481482" vertical-offset="0" max-vertical-offset="540" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="16" selection-start="405" selection-end="405" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1615">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="77" column="0" selection-start="1488" selection-end="1488" vertical-scroll-proportion="0.6692607" vertical-offset="965" max-vertical-offset="1564"> <state line="79" column="0" selection-start="1719" selection-end="1719" vertical-scroll-proportion="0.625969" vertical-offset="1020" max-vertical-offset="1547">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="47" selection-start="657" selection-end="657" vertical-scroll-proportion="0.4728682" vertical-offset="113" max-vertical-offset="646">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="59" selection-start="390" selection-end="390" vertical-scroll-proportion="0.56007755" vertical-offset="0" max-vertical-offset="516">
<folding> <folding>
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#!!top" expanded="true" /> <marker date="1402234045108" expanded="true" signature="-1:-1" placeholder="SELECT SValu..." />
<element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#!!top" expanded="true" /> <marker date="1402234045108" expanded="true" signature="-1:-1" placeholder="SELECT [Valu..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/MsHtml.php">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="6" selection-start="12" selection-end="12" vertical-scroll-proportion="0.032945737" vertical-offset="0" max-vertical-offset="1292">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="84" selection-start="2113" selection-end="2113" vertical-scroll-proportion="1.1292247" vertical-offset="299" max-vertical-offset="2210">
<folding>
<marker date="1402227448530" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1402227448530" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="478" column="21" selection-start="8545" selection-end="8545" vertical-scroll-proportion="0.65682656" vertical-offset="7770" max-vertical-offset="8789">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/msmain/admin_updateEGH.php">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="0" selection-start="120" selection-end="120" vertical-scroll-proportion="-3.2692308" vertical-offset="0" max-vertical-offset="272">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/components/extendedGitGraph/extendedGitGraph.php">
<provider selected="true" editor-type-id="text-editor">
<state line="43" column="5" selection-start="1264" selection-end="1264" vertical-scroll-proportion="1.4166666" vertical-offset="0" max-vertical-offset="8483">
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

View File

@ -441,3 +441,71 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu {
color: #2C3E50; color: #2C3E50;
text-shadow: 0px 0px 8px #00F; text-shadow: 0px 0px 8px #00F;
} }
/* About/Gitbox
-------------------------------------------------- */
.gitbox-container {
border: 2px solid #CAECEC;
border-radius: 6px;
text-align: center;
margin-bottom: 10px;
}
.gitbox-header {
background-color: #F5F5F5;
border-bottom: 2px solid #CAECEC;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
padding: 5px;
margin-bottom: 10px;
font-size: 13px;
font-weight: bold;
color: gray;
}
.gitbox-footer {
background-color: #F5F5F5;
border-top: 2px solid #CAECEC;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
margin-top: 10px;
}
.gitbox-footer-box {
width: 385px;
display: table-cell;
}
.gitbox-footer-box:not(:first-child) {
border-left: 2px solid #CAECEC;
}
.gitbox-footer-box-header {
display: block;
color: #777;
font-size: 11px;
}
.gitbox-footer-box-number {
display: block;
font-weight: 300;
line-height: 1.3em;
font-size: 24px;
}
.gitbox-footer-box-footer {
display: block;
color: #777;
font-size: 11px;
}

View File

@ -27,8 +27,44 @@ $this->selectedNav = 'about';
<p>If you want you can look <?php echo MsHtml::link('here', '/programs'); ?> at the things I programd </p> <p>If you want you can look <?php echo MsHtml::link('here', '/programs'); ?> at the things I programd </p>
</div> </div>
<?php echo (new ExtendedGitGraph('Mikescher'))->loadFinished(); ?> <?php $egh = (new ExtendedGitGraph('Mikescher'))->loadFinishedData(); ?>
<br /> <div class="gitbox-container">
<div class="gitbox-header">My Github Commits</div>
<?php echo $egh['content']; ?>
<div class="gitbox-footer">
<div class="gitbox-footer-box">
<span class="gitbox-footer-box-header">Last Update</span>
<span class="gitbox-footer-box-number"><?php echo $egh['creation']->diff(new DateTime())->format('%d'); ?> day<?php echo (($egh['creation']->diff(new DateTime())->format('d') == 1) ? '' : 's')?> ago</span>
<span class="gitbox-footer-box-footer"><?php echo $egh['creation']->format('M d Y'); ?></span>
</div>
<div class="gitbox-footer-box">
<span class="gitbox-footer-box-header">Total commits</span>
<span class="gitbox-footer-box-number"><?php echo $egh['total'] ?></span>
<span class="gitbox-footer-box-footer"><?php echo $egh['start']->format('M d Y') . ' - ' . $egh['end']->format('M d Y'); ?></span>
</div>
<div class="gitbox-footer-box">
<span class="gitbox-footer-box-header">Longest streak</span>
<span class="gitbox-footer-box-number"><?php echo $egh['streak']; ?> day<?php echo (($egh['streak'] == 1) ? '' : 's'); ?></span>
<span class="gitbox-footer-box-footer"><?php echo $egh['streak_start']->format('M d Y') . ' - ' . $egh['streak_end']->format('M d Y'); ?></span>
</div>
<div class="gitbox-footer-box">
<span class="gitbox-footer-box-header">Max commits</span>
<span class="gitbox-footer-box-number"><?php echo $egh['max_commits']; ?> / day</span>
<span class="gitbox-footer-box-footer"><?php echo $egh['max_commits_date']->format('M d Y'); ?></span>
</div>
<div class="gitbox-footer-box">
<span class="gitbox-footer-box-header">Avg commits</span>
<span class="gitbox-footer-box-number"><?php echo number_format($egh['avg_commits'],1); ?> / day</span>
<span class="gitbox-footer-box-footer"><?php echo $egh['start']->format('M d Y') . ' - ' . $egh['end']->format('M d Y'); ?></span>
</div>
</div>
</div>
<div class="well cstm-well-light"> <div class="well cstm-well-light">
<?php <?php

View File

@ -15,7 +15,7 @@
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<?php <?php
echo MsHtml::lead('Programs'); echo MsHtml::lead('Logs');
echo MsHtml::stackedTabs( echo MsHtml::stackedTabs(
[ [
@ -28,7 +28,7 @@
<div class="span3"> <div class="span3">
<?php <?php
echo MsHtml::lead('Logs'); echo MsHtml::lead('Programs');
echo MsHtml::stackedTabs( echo MsHtml::stackedTabs(
[ [
@ -68,16 +68,15 @@
<div class="well well-small"> <div class="well well-small">
<?php <?php
$egh = new ExtendedGitGraph('Mikescher'); $egh = $egh = (new ExtendedGitGraph('Mikescher'))->loadFinishedData();
$egh->loadData();
?> ?>
<h2>ExtendedGitGraph</h2> <h2>ExtendedGitGraph</h2>
<hr> <hr>
<strong>Last Update: </strong> <?php echo $egh->getFinishedDate()->format('d.m.Y H:i'); ?> <br> <strong>Last Update: </strong> <?php echo $egh['creation']->format('d.m.Y H:i'); ?> <br>
<strong>Repositories: </strong> <?php echo count($egh->repositories); ?> <br> <strong>Repositories: </strong> <?php echo $egh['repos']; ?> <br>
<strong>Commits: </strong> <?php echo count($egh->commits); ?> <br> <strong>Commits: </strong> <?php echo $egh['total']; ?> <br>
<br><br> <br><br>