Commit f3097356 authored by Daniele Venzano's avatar Daniele Venzano

Add some styling to the web pages

parent 50c5599b
......@@ -5,7 +5,7 @@
<entry url="file://$PROJECT_DIR$">
<entryData>
<resourceRoots>
<path value="file://$PROJECT_DIR$/caaas/static" />
<path value="file://$PROJECT_DIR$/caaas" />
</resourceRoots>
</entryData>
</entry>
......
......@@ -2,9 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="75bc5abc-acc8-44ff-9d8a-85151a0cbca1" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/api.py" afterPath="$PROJECT_DIR$/caaas/api.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/apps.html" afterPath="$PROJECT_DIR$/caaas/templates/apps.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/web.py" afterPath="$PROJECT_DIR$/caaas/web.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/caaas/static/caaas.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/base.html" afterPath="$PROJECT_DIR$/caaas/templates/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/home.html" afterPath="$PROJECT_DIR$/caaas/templates/home.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/index.html" afterPath="$PROJECT_DIR$/caaas/templates/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/notebook.html" afterPath="$PROJECT_DIR$/caaas/templates/notebook.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/webResources.xml" afterPath="$PROJECT_DIR$/.idea/webResources.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="caaas.iws" />
......@@ -127,14 +130,12 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="swarm_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<file leaf-file-name="home.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="-6.5384617">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -149,58 +150,76 @@
</provider>
</entry>
</file>
<file leaf-file-name="web.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/web.py">
<file leaf-file-name="base.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.5">
<caret line="34" column="87" selection-start-line="34" selection-start-column="87" selection-end-line="34" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="caaas.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/static/caaas.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="137" column="23" selection-start-line="137" selection-start-column="23" selection-end-line="137" selection-end-column="23" />
<folding>
<element signature="e#0#59#0" expanded="true" />
</folding>
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="api.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<file leaf-file-name="notebook.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.58894646">
<caret line="92" column="45" selection-start-line="92" selection-start-column="45" selection-end-line="92" selection-end-column="45" />
<folding>
<element signature="e#0#45#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="0.16728167">
<caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="apache-proxy.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/apache-proxy.py">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#23#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="-12.423077">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="utils.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/utils.py">
<file leaf-file-name="base_user.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/base_user.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<state vertical-scroll-proportion="-1.9615384">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="gen_dockerfiles.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/gen_dockerfiles.py">
<file leaf-file-name="web.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/web.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
<folding />
<caret line="137" column="23" selection-start-line="137" selection-start-column="23" selection-end-line="137" selection-end-column="23" />
<folding>
<element signature="e#0#59#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="api.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="92" column="45" selection-start-line="92" selection-start-column="45" selection-end-line="92" selection-end-column="45" />
<folding>
<element signature="e#0#45#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -265,18 +284,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="config_parser.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/config_parser.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#0#37#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -284,6 +291,7 @@
<list>
<option value="Html5" />
<option value="Python Script" />
<option value="CSS File" />
</list>
</option>
</component>
......@@ -293,7 +301,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/caaas.wsgi" />
<option value="$PROJECT_DIR$/images/templates/master.tmpl" />
<option value="$PROJECT_DIR$/images/templates/common.tmpl" />
<option value="$PROJECT_DIR$/images/templates/shell.tmpl" />
......@@ -321,17 +328,13 @@
<option value="$PROJECT_DIR$/caaas/swarm_manager.py" />
<option value="$PROJECT_DIR$/caaas/spark_app_execution.py" />
<option value="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
<option value="$PROJECT_DIR$/caaas/templates/terminate.html" />
<option value="$PROJECT_DIR$/caaas/templates/submit.html" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
<option value="$PROJECT_DIR$/apache-proxy.py" />
<option value="$PROJECT_DIR$/caaas/proxy_manager.py" />
<option value="$PROJECT_DIR$/caaas/templates/base_user.html" />
<option value="$PROJECT_DIR$/caaas/templates/inspect.html" />
<option value="$PROJECT_DIR$/caaas/templates/home.html" />
<option value="$PROJECT_DIR$/caaas/sql.py" />
<option value="$PROJECT_DIR$/caaas/templates/index.html" />
<option value="$PROJECT_DIR$/caaas/__init__.py" />
<option value="$PROJECT_DIR$/images/files/start-worker.sh" />
<option value="$PROJECT_DIR$/caaas/templates/status.html" />
......@@ -344,6 +347,11 @@
<option value="$PROJECT_DIR$/caaas/templates/apps.html" />
<option value="$PROJECT_DIR$/caaas/web.py" />
<option value="$PROJECT_DIR$/caaas/api.py" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
<option value="$PROJECT_DIR$/caaas/templates/home.html" />
<option value="$PROJECT_DIR$/caaas/templates/index.html" />
<option value="$PROJECT_DIR$/caaas/static/caaas.css" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
</list>
</option>
</component>
......@@ -509,6 +517,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="static" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope">
......@@ -586,6 +612,7 @@
<property name="DefaultHtmlFileTemplate" value="Html5" />
<property name="FullScreen" value="false" />
<property name="restartRequiresConfirmation" value="true" />
<property name="list.type.of.created.stylesheet" value="CSS" />
</component>
<component name="PyConsoleOptionsProvider">
<option name="myPythonConsoleState">
......@@ -860,6 +887,13 @@
<option name="number" value="Default" />
<updated>1438336610266</updated>
</task>
<task id="LOCAL-00001" summary="Fix url variable types">
<created>1439475265498</created>
<option name="number" value="00001" />
<option name="project" value="LOCAL" />
<updated>1439475265498</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TodoView">
......@@ -873,9 +907,10 @@
</component>
<component name="ToolWindowManager">
<frame x="255" y="36" width="1606" height="998" extended-state="0" />
<editor active="false" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298731" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32871974" sideWeight="0.49552238" order="9" 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.32911393" sideWeight="0.5059701" order="13" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39907727" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
......@@ -884,14 +919,13 @@
<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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19723183" sideWeight="0.49402985" order="2" 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.33" sideWeight="0.5" order="12" 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.194696" 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.194696" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12742561" sideWeight="0.5" order="3" 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.32871974" 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.24967659" sideWeight="0.5" order="1" 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.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29988465" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29988465" sideWeight="0.5" order="3" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32911393" sideWeight="0.49552238" order="9" 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="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="REST Client" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
......@@ -939,6 +973,10 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Fix url variable types" />
<option name="LAST_COMMIT_MESSAGE" value="Fix url variable types" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<default-breakpoints>
......@@ -957,25 +995,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/images/templates/common.tmpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..notebooks">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
<provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/notebook/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1161,14 +1180,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.461538">
<caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/proxy_manager.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1177,22 +1188,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/base_user.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.9615384">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.076923">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/inspect.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.8461537">
......@@ -1201,14 +1196,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0">
<caret line="0" column="21" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/terminate.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.2692308">
......@@ -1233,14 +1220,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.230769">
<caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1288,7 +1267,7 @@
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#23#0" expanded="true" />
<element signature="e#0#23#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1439,7 +1418,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.58894646">
<state vertical-scroll-proportion="0.0">
<caret line="92" column="45" selection-start-line="92" selection-start-column="45" selection-end-line="92" selection-end-column="45" />
<folding>
<element signature="e#0#45#0" expanded="true" />
......@@ -1447,5 +1426,61 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/base_user.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.9615384">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.5">
<caret line="34" column="87" selection-start-line="34" selection-start-column="87" selection-end-line="34" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.5384617">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.423077">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/static/caaas.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.16728167">
<caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
body {
font-family: sans-serif;
max-width: 800px;
margin-left: 20px;
}
a:link {
color: rgba(79, 140, 30, 1);
text-decoration: none;
}
a:visited {
color: rgba(79, 140, 30, 1);
text-decoration: none;
}
div#activities {
padding-left: 3em;
}
a.activity {
width: 100px;
height: 80px;
border: 1px black solid;
border-radius: 15px;
float: left;
margin-right: 10px;
padding: 1em;
text-align: center;
display: block;
}
a.activity:hover {
transition: background-color 200ms linear;
background-color: khaki;
}
div.user_info {
font-size: smaller;
clear: both;
padding-top: 20px;
}
div.caaas_status_line {
float: left;
}
span#app_name {
font-family: cursive;
font-size: larger;
}
span#status {
font-size: smaller;
}
div.copyright {
float: left;
padding-left: 3em;
}
\ No newline at end of file
......@@ -8,6 +8,7 @@
<script type="application/javascript">
var api_endpoint = "/api";
</script>
<link rel="stylesheet" href="/static/caaas.css" type="text/css">
{% endblock %}
</head>
<body>
......@@ -29,8 +30,17 @@
<div id="content">{% block content %}{% endblock %}</div>
<div id="footer">
{% block footer %}
<div class="caaas_status"><p><em>CAaaS</em> status: <span id="num_nodes">N/A</span> available nodes, <span id="num_containers">N/A</span> containers running</p></div>
<h6>&copy; Copyright 2015 by <a href="http://distsysgroup.wordpress.com/">DSG</a></h6>
<div class="caaas_status_line">
<p>
<span id="app_name"><a href="{{ url_for("web_status") }}">CAaaS</a></span>
<span id="status">
[<span id="num_nodes">N/A</span> swarm nodes, <span id="num_containers">N/A</span> active containers]
</span>
</p>
</div>
<div class="copyright">
<h6>&copy; Copyright 2015 by <a href="http://distsysgroup.wordpress.com/">DSG</a></h6>
</div>
{% endblock %}
</div>
</body>
......
{% extends "base_user.html" %}
{% extends "base.html" %}
{% block title %}Home{% endblock %}
{% block content %}
<p>Start an activity:</p>
<ul>
<li><a href="{{ url_for("web_notebook", user_id=user_id) }}">Give me a Spark notebook</a></li>
<li><a href="{{ url_for("web_spark_submit", user_id=user_id) }}">Submit a Spark application</a></li>
</ul>
<p>My activities:</p>
<ul>
<li><a href="{{ url_for("web_user_apps", user_id=user_id) }}">Applications</a></li>
</ul>
<div id="activities">
<a class="activity" href="{{ url_for("web_notebook", user_id=user_id) }}">Give me a Spark notebook</a>
<p>Cluster status:</p>
<ul>
<li><a href="{{ url_for("web_status") }}">Overview</a></li>
</ul>
<a class="activity" href="{{ url_for("web_spark_submit", user_id=user_id) }}">Submit a Spark application</a>
<p>Your email address used for notifications is: {{ email }}</p>
<a class="activity" href="{{ url_for("web_user_apps", user_id=user_id) }}">History</a>
</div>
<div class="user_info">
<p>Email address used for notifications: <a href="mailto:{{ email }}">{{ email }}</a></p>
</div>
{% endblock %}
\ No newline at end of file
......@@ -11,11 +11,12 @@ function process()
</script>
<form onSubmit="return process();">
<label for="user">Type your username to start:</label>
<input id="user" autofocus required type="email" autocomplete="on" name="email">
<label for="user">Type your email address to start:</label>
<input id="user" autofocus required type="email" autocomplete="on" name="email" size="30">
<input type="submit" value="Start">
</form>
<p>To create a new user, just type a new username in the box above, only lowercase letters are accepted.</p>
<p>If you are a new user, just type your email address in the box above, it will be used to send notifications about the applications
you start.</p>
{% endblock %}
\ No newline at end of file
{% extends "base_user.html" %}
{% block title %}Spark notebook{% endblock %}
{% block content %}
<h2>Notebook</h2>
<h2>Spark Notebook</h2>
<p>You notebook is available at: <a href="{{ notebook_address }}">{{ notebook_address }}</a></p>
<p>Please note that notebooks are automatically terminated {{ max_age }} hours after the last time they are accessed.
A warning email will be sent {{ wrn_time }} hours before.</p>
<p>Please note that notebooks are <b>automatically terminated {{ max_age }} hours after the last access</b>.
A warning email will be sent {{ wrn_time }} hours before this happens.</p>
{% endblock %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment