Commit e988554e authored by Daniele Venzano's avatar Daniele Venzano

Fix a few bugs and add some css to the apps page

parent f3097356
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="75bc5abc-acc8-44ff-9d8a-85151a0cbca1" name="Default" comment="">
<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" />
<list default="true" id="75bc5abc-acc8-44ff-9d8a-85151a0cbca1" name="Default" comment="Fix a few bugs and add some css to the apps page">
<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/static/caaas.css" afterPath="$PROJECT_DIR$/caaas/static/caaas.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/cleanup_thread.py" afterPath="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/proxy_manager.py" afterPath="$PROJECT_DIR$/caaas/proxy_manager.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/requirements.txt" afterPath="$PROJECT_DIR$/requirements.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/sql.py" afterPath="$PROJECT_DIR$/caaas/sql.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/submit.html" afterPath="$PROJECT_DIR$/caaas/templates/submit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/terminate.html" afterPath="$PROJECT_DIR$/caaas/templates/terminate.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/web.py" afterPath="$PROJECT_DIR$/caaas/web.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="caaas.iws" />
......@@ -22,7 +27,7 @@
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1439475055425" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1439546430503" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$apache_proxy.coverage" NAME="apache-proxy Coverage Results" MODIFIED="1439272960154" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="CreatePatchCommitExecutor">
......@@ -130,156 +135,161 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="home.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<file leaf-file-name="swarm_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<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 vertical-scroll-proportion="0.0">
<caret line="82" column="34" selection-start-line="82" selection-start-column="34" selection-end-line="82" selection-end-column="34" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="apps.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/apps.html">
<file leaf-file-name="swarm_pull.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/swarm_pull.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.8461537">
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<state vertical-scroll-proportion="0.0">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<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="-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 vertical-scroll-proportion="0.0">
<caret line="47" column="23" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" />
<folding>
<element signature="e#0#59#0" expanded="true" />
</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">
<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="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
<caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="notebook.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<file leaf-file-name="apps.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/apps.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" />
<state vertical-scroll-proportion="-11.461538">
<caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<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="-12.423077">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<state vertical-scroll-proportion="0.0">
<caret line="55" column="8" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base_user.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/base_user.html">
<file leaf-file-name="sql.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/sql.py">
<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 vertical-scroll-proportion="0.5641953">
<caret line="360" column="0" selection-start-line="360" selection-start-column="0" selection-end-line="360" selection-end-column="0" />
<folding>
<marker date="1439546421450" expanded="true" signature="1064:1101" placeholder="INSERT INTO ..." />
<marker date="1439546421450" expanded="true" signature="1320:1356" placeholder="SELECT COUNT..users..." />
<marker date="1439546421450" expanded="true" signature="1580:1613" placeholder="SELECT id FR..users..." />
<marker date="1439546421450" expanded="true" signature="1914:1947" placeholder="SELECT email..users..." />
<marker date="1439546421450" expanded="true" signature="2157:2184" placeholder="SELECT id, e..users..." />
<marker date="1439546421450" expanded="true" signature="2488:2553" placeholder="SELECT COUNT..applications..." />
<marker date="1439546421450" expanded="true" signature="2616:2696" placeholder="SELECT COUNT..applications..." />
<marker date="1439546421450" expanded="true" signature="2955:2984" placeholder="SELECT COUNT..clusters..." />
<marker date="1439546421450" expanded="true" signature="3047:3091" placeholder="SELECT COUNT..clusters..." />
<marker date="1439546421450" expanded="true" signature="3394:3425" placeholder="SELECT COUNT..containers..." />
<marker date="1439546421450" expanded="true" signature="3531:3577" placeholder="SELECT COUNT..containers..." />
<marker date="1439546421450" expanded="true" signature="3697:3746" placeholder="SELECT COUNT..containers..." />
<marker date="1439546421450" expanded="true" signature="3873:3937" placeholder="SELECT COUNT..containers..." />
<marker date="1439546421450" expanded="true" signature="4186:4246" placeholder="SELECT id FR..clusters..." />
<marker date="1439546421450" expanded="true" signature="4699:4739" placeholder="SELECT inter..proxy..." />
<marker date="1439546421450" expanded="true" signature="5106:5164" placeholder="SELECT id FR..proxy..." />
<marker date="1439546421450" expanded="true" signature="5525:5577" placeholder="INSERT INTO ..." />
<marker date="1439546421450" expanded="true" signature="5826:5873" placeholder="UPDATE clust..." />
<marker date="1439546421450" expanded="true" signature="6117:6222" placeholder="INSERT INTO ..." />
<marker date="1439546421450" expanded="true" signature="6539:6644" placeholder="INSERT INTO ..." />
<marker date="1439546421450" expanded="true" signature="6948:7002" placeholder="SELECT id, u..clusters..." />
<marker date="1439546421450" expanded="true" signature="7065:7134" placeholder="SELECT id, u..clusters..." />
<marker date="1439546421450" expanded="true" signature="7599:7631" placeholder="SELECT * FRO..clusters..." />
<marker date="1439546421450" expanded="true" signature="7984:8063" placeholder="SELECT id, d..containers..." />
<marker date="1439546421450" expanded="true" signature="8169:8263" placeholder="SELECT id, d..containers..." />
<marker date="1439546421450" expanded="true" signature="8383:8480" placeholder="SELECT id, d..containers..." />
<marker date="1439546421450" expanded="true" signature="8607:8719" placeholder="SELECT id, d..containers..." />
<marker date="1439546421450" expanded="true" signature="9266:9355" placeholder="SELECT id, d..containers..." />
<marker date="1439546421450" expanded="true" signature="9917:9984" placeholder="SELECT id, c..containers..." />
<marker date="1439546421450" expanded="true" signature="10336:10355" placeholder="SELECT * FRO..proxy..." />
<marker date="1439546421450" expanded="true" signature="10443:10482" placeholder="SELECT * FRO..proxy..." />
<marker date="1439546421450" expanded="true" signature="10564:10601" placeholder="SELECT * FRO..proxy..." />
<marker date="1439546421450" expanded="true" signature="10895:10932" placeholder="DELETE FROM ..." />
<marker date="1439546421450" expanded="true" signature="11110:11142" placeholder="DELETE FROM ..." />
<marker date="1439546421450" expanded="true" signature="11316:11346" placeholder="DELETE FROM ..." />
<marker date="1439546421450" expanded="true" signature="11587:11681" placeholder="INSERT INTO ..." />
<marker date="1439546421450" expanded="true" signature="11962:12071" placeholder="SELECT id FR..applications..." />
<marker date="1439546421450" expanded="true" signature="12162:12196" placeholder="DELETE FROM ..." />
<marker date="1439546421450" expanded="true" signature="12385:12433" placeholder="UPDATE appli..." />
<marker date="1439546421450" expanded="true" signature="12614:12711" placeholder="UPDATE appli..." />
<marker date="1439546421450" expanded="true" signature="12890:12972" placeholder="UPDATE appli..." />
<marker date="1439546421450" expanded="true" signature="13142:13226" placeholder="UPDATE appli..." />
<marker date="1439546421450" expanded="true" signature="13453:13479" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13453:13501" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13453:13506" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13569:13610" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13569:13621" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13569:13639" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="13934:13970" placeholder="SELECT * FRO..applications..." />
<marker date="1439546421450" expanded="true" signature="14207:14252" placeholder="SELECT id FR..applications..." />
<marker date="1439546421450" expanded="true" signature="14565:14606" placeholder="UPDATE proxy..." />
<marker date="1439546421450" expanded="true" signature="14795:14872" placeholder="SELECT clust..proxy..." />
</folding>
</state>
</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="cleanup_thread.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/cleanup_thread.py">
<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" />
<caret line="99" column="21" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<folding>
<element signature="e#0#59#0" expanded="true" />
<element signature="e#0#40#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">
<file leaf-file-name="submit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/submit.html">
<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 vertical-scroll-proportion="-15.038462">
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="sql.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/sql.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="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<marker date="1439472763522" expanded="true" signature="1064:1101" placeholder="INSERT INTO ..." />
<marker date="1439472763522" expanded="true" signature="1320:1356" placeholder="SELECT COUNT..users..." />
<marker date="1439472763522" expanded="true" signature="1580:1613" placeholder="SELECT id FR..users..." />
<marker date="1439472763522" expanded="true" signature="1914:1947" placeholder="SELECT email..users..." />
<marker date="1439472763522" expanded="true" signature="2157:2184" placeholder="SELECT id, e..users..." />
<marker date="1439472763522" expanded="true" signature="2488:2553" placeholder="SELECT COUNT..applications..." />
<marker date="1439472763522" expanded="true" signature="2616:2696" placeholder="SELECT COUNT..applications..." />
<marker date="1439472763522" expanded="true" signature="2955:2984" placeholder="SELECT COUNT..clusters..." />
<marker date="1439472763522" expanded="true" signature="3047:3091" placeholder="SELECT COUNT..clusters..." />
<marker date="1439472763522" expanded="true" signature="3394:3425" placeholder="SELECT COUNT..containers..." />
<marker date="1439472763522" expanded="true" signature="3531:3577" placeholder="SELECT COUNT..containers..." />
<marker date="1439472763522" expanded="true" signature="3697:3746" placeholder="SELECT COUNT..containers..." />
<marker date="1439472763522" expanded="true" signature="3873:3937" placeholder="SELECT COUNT..containers..." />
<marker date="1439472763522" expanded="true" signature="4186:4246" placeholder="SELECT id FR..clusters..." />
<marker date="1439472763522" expanded="true" signature="4699:4739" placeholder="SELECT inter..proxy..." />
<marker date="1439472763522" expanded="true" signature="5106:5164" placeholder="SELECT id FR..proxy..." />
<marker date="1439472763522" expanded="true" signature="5525:5577" placeholder="INSERT INTO ..." />
<marker date="1439472763522" expanded="true" signature="5826:5873" placeholder="UPDATE clust..." />
<marker date="1439472763522" expanded="true" signature="6117:6222" placeholder="INSERT INTO ..." />
<marker date="1439472763522" expanded="true" signature="6539:6644" placeholder="INSERT INTO ..." />
<marker date="1439472763522" expanded="true" signature="6948:7002" placeholder="SELECT id, u..clusters..." />
<marker date="1439472763522" expanded="true" signature="7065:7134" placeholder="SELECT id, u..clusters..." />
<marker date="1439472763522" expanded="true" signature="7551:7583" placeholder="SELECT * FRO..clusters..." />
<marker date="1439472763522" expanded="true" signature="7936:8015" placeholder="SELECT id, d..containers..." />
<marker date="1439472763522" expanded="true" signature="8121:8215" placeholder="SELECT id, d..containers..." />
<marker date="1439472763522" expanded="true" signature="8335:8432" placeholder="SELECT id, d..containers..." />
<marker date="1439472763522" expanded="true" signature="8559:8671" placeholder="SELECT id, d..containers..." />
<marker date="1439472763522" expanded="true" signature="9218:9307" placeholder="SELECT id, d..containers..." />
<marker date="1439472763522" expanded="true" signature="9869:9936" placeholder="SELECT id, c..containers..." />
<marker date="1439472763522" expanded="true" signature="10288:10307" placeholder="SELECT * FRO..proxy..." />
<marker date="1439472763522" expanded="true" signature="10395:10434" placeholder="SELECT * FRO..proxy..." />
<marker date="1439472763522" expanded="true" signature="10516:10553" placeholder="SELECT * FRO..proxy..." />
<marker date="1439472763522" expanded="true" signature="10847:10884" placeholder="DELETE FROM ..." />
<marker date="1439472763522" expanded="true" signature="11062:11094" placeholder="DELETE FROM ..." />
<marker date="1439472763522" expanded="true" signature="11268:11298" placeholder="DELETE FROM ..." />
<marker date="1439472763522" expanded="true" signature="11539:11633" placeholder="INSERT INTO ..." />
<marker date="1439472763522" expanded="true" signature="11914:12023" placeholder="SELECT id FR..applications..." />
<marker date="1439472763522" expanded="true" signature="12114:12148" placeholder="DELETE FROM ..." />
<marker date="1439472763522" expanded="true" signature="12337:12385" placeholder="UPDATE appli..." />
<marker date="1439472763522" expanded="true" signature="12566:12663" placeholder="UPDATE appli..." />
<marker date="1439472763522" expanded="true" signature="12842:12924" placeholder="UPDATE appli..." />
<marker date="1439472763522" expanded="true" signature="13094:13178" placeholder="UPDATE appli..." />
<marker date="1439472763522" expanded="true" signature="13405:13431" placeholder="SELECT * FRO..applications..." />
<marker date="1439472763522" expanded="true" signature="13494:13535" placeholder="SELECT * FRO..applications..." />
<marker date="1439472763522" expanded="true" signature="13832:13868" placeholder="SELECT * FRO..applications..." />
<marker date="1439472763522" expanded="true" signature="14105:14150" placeholder="SELECT id FR..applications..." />
<marker date="1439472763522" expanded="true" signature="14463:14504" placeholder="UPDATE proxy..." />
<marker date="1439472763522" expanded="true" signature="14693:14770" placeholder="SELECT clust..proxy..." />
</folding>
<state vertical-scroll-proportion="-5.230769">
<caret line="8" column="17" selection-start-line="7" selection-start-column="4" selection-end-line="8" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
......@@ -324,17 +334,10 @@
<option value="$PROJECT_DIR$/caaas.ini" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/caaas/config_parser.py" />
<option value="$PROJECT_DIR$/main.py" />
<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/terminate.html" />
<option value="$PROJECT_DIR$/caaas/templates/submit.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/sql.py" />
<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,14 +347,21 @@
<option value="$PROJECT_DIR$/images/worker/files/start-worker.sh" />
<option value="$PROJECT_DIR$/images/swarm_pull.sh" />
<option value="$PROJECT_DIR$/images/build_images.sh" />
<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" />
<option value="$PROJECT_DIR$/caaas/templates/terminate.html" />
<option value="$PROJECT_DIR$/caaas/api.py" />
<option value="$PROJECT_DIR$/caaas/swarm_manager.py" />
<option value="$PROJECT_DIR$/caaas/web.py" />
<option value="$PROJECT_DIR$/caaas/proxy_manager.py" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
<option value="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<option value="$PROJECT_DIR$/caaas/templates/apps.html" />
<option value="$PROJECT_DIR$/caaas/static/caaas.css" />
<option value="$PROJECT_DIR$/caaas/templates/submit.html" />
<option value="$PROJECT_DIR$/caaas/sql.py" />
</list>
</option>
</component>
......@@ -443,7 +453,7 @@
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers ProjectPane="true" />
<showMembers ProjectPane="false" />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
......@@ -453,6 +463,69 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope">
<subPane subId="Problems">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
<subPane subId="Project Files">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="templates">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -537,69 +610,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope">
<subPane subId="Problems">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
<subPane subId="Project Files">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="caaas">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="templates">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -893,10 +903,16 @@
<option name="project" value="LOCAL" />
<updated>1439475265498</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="Add some styling to the web pages">
<created>1439479663575</created>
<option name="number" value="00002" />
<option name="project" value="LOCAL" />
<updated>1439479663575</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TodoView">
<component name="TodoView" selected-index="4">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
......@@ -907,27 +923,27 @@
</component>
<component name="ToolWindowManager">
<frame x="255" y="36" width="1606" height="998" extended-state="0" />
<editor active="true" />
<editor active="false" />
<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="TODO" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3298731" sideWeight="0.5" order="6" 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" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756633" sideWeight="0.49402985" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" sideWeight="0.5" order="8" 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="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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19728331" 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="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="false" weight="0.32871974" 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="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" />
<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" />
<window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32871974" sideWeight="0.5" order="15" 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" />
......@@ -975,7 +991,9 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Fix url variable types" />
<option name="LAST_COMMIT_MESSAGE" value="Fix url variable types" />
<MESSAGE value="Add some styling to the web pages" />
<MESSAGE value="Fix a few bugs and add some css to the apps page" />
<option name="LAST_COMMIT_MESSAGE" value="Fix a few bugs and add some css to the apps page" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -986,7 +1004,7 @@
</properties>
</breakpoint>
</default-breakpoints>
<option name="time" value="44" />
<option name="time" value="46" />
</breakpoint-manager>
<watches-manager>
<configuration name="PythonConfigurationType">
......@@ -1003,14 +1021,14 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider editor-type-id="markdown-preview-editor">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.62069">
<caret line="57" column="107" selection-start-line="57" selection-start-column="107" selection-end-line="57" selection-end-column="107" />
</state>
</provider>
<provider editor-type-id="markdown-preview-editor">
<state />
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/console.sql">
<provider selected="true" editor-type-id="text-editor">
......@@ -1069,52 +1087,52 @@
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..users">
<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="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..containers">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..containers">
<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="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..clusters">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..clusters">
<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="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..applications">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..applications">
<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>
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/files/submit.sh">
<provider selected="true" editor-type-id="text-editor">
......@@ -1124,15 +1142,14 @@
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..proxy">
<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" />
<folding />
</state>
</provider>
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
......@@ -1140,7 +1157,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
......@@ -1152,16 +1168,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding>
<element signature="e#0#21#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/spark_app_execution.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1172,35 +1178,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="28" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="28" />
<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">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />