Stefano Costa avatar Stefano Costa committed 9739075

Revamp style

Comments (0)

Files changed (4)

+@import url(http://jujucharms.com/static/bootstrap.min.css)

templates/export.html

 {% extends "layout.html" %}
 {% block body %}
 
-  Your dataset <strong>{{ data.title }}</strong> was exported from <strong>{{ data.if }}</strong> to <strong>{{ data.of }}</strong>.
+  <p>Your dataset <strong>{{ data.title }}</strong> was exported
+  from <strong>{{ data.if }}</strong> to <strong>{{ data.of }}</strong>.</p>
 
   <pre>
   {{ data.exported }}

templates/home.html

 {% extends "layout.html" %}
 {% block body %}
-  <form action="{{ url_for('export') }}" method=post class=paste-data>
-    <dl>
-      <dt>Title:
-      <dd><input type=text size=30 name=title>
-      <dt>Input format:
-      <dd><select name=input_format required=required>
-          {% for if in input_formats %}<option value="{{ if.k }}" label="{{ if.v }}">{{ if.v }}</option>{% endfor %}
-      </select>
-      <dt>Output format:
-      <dd><select name=output_format required=required>
-          {% for of in output_formats %}<option value="{{ of.k }}" label="{{ of.v }}">{{ of.v }}</option>{% endfor %}
-      </select>
-      <dt>Data: (don't have data at hand? check some sample data from <a href="https://bitbucket.org/steko/totalopenstation/src/tip/sample_data">our repository</a>)
-      <dd><textarea name=data rows=35 cols=80>Paste your data here.</textarea>
-      <dd><input type=submit value=Export>
-    </dl>
-  </form>
+<div class="row">
+  <div class="span8">
+    <form action="{{ url_for('export') }}" method=post class="form-horizontal">
+      <fieldset>
+	<div class="control-group">
+	  <label class="control-label" for="title">Title</label>
+	  <div class="controls">
+	    <input type=text name="title" value="" id="title" placeholder="Your survey project" />
+	  </div>
+	</div>
+	<div class="control-group">
+	  <label class="control-label" for="input_format">Input format</label>
+	  <div class="controls">
+	    <select name="input_format">
+		{% for if in input_formats %}
+		<option value="{{ if.k }}" label="{{ if.v }}">{{ if.v }}</option>
+		{% endfor %}
+	    </select>
+	  </div>
+	</div>
+        <div class="control-group">
+          <label class="control-label" for="output_format">Output format</label>
+          <div class="controls">
+            <select name="output_format">
+                {% for if in output_formats %}
+                <option value="{{ if.k }}" label="{{ if.v }}">{{ if.v }}</option>
+                {% endfor %}
+            </select>
+          </div>
+        </div>
+	<div class="control-group">
+        <label class="control-label" for="data">Data</label>
+	<div class="controls">
+	<textarea name="data" placeholder="Paste your data here."></textarea>
+	</div>
+	</div>
+	<div class="form-actions">
+	  <button class="btn" type="cancel">Reset</button>
+	  <button class="btn btn-primary" type="submit">Convert</button>
+	</div>
+      </fieldset>
+    </form>
+  </div>
+  <div class="span4">
+    <div class="well">
+      <p>This is the demo service for
+      <a href="http://tops.iosa.it/">Total Open Station</a>,
+      a free software program to manage survey data from total stations.</p>
+      <p>It is a web application made
+      with <a href="http://flask.pocoo.org/">Flask</a>. Total Open Station is
+      written in the Python programming language.</p>
+      <p>The source code is hosted at <a href="https://bitbucket.org/steko/tops-cloud">bitbucket</a>.</p>
+      <p>Total Open Station is developed by <a href="http://www.iosa.it/">IOSA</a>.</p>
+    </div>
+  </div>
+</div>
 {% endblock %}

templates/layout.html

 <!doctype html>
+<head>
 <title>TOPS in the Cloud</title>
 <link rel=stylesheet type=text/css href="{{ url_for('static', filename='style.css') }}">
 <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" />
-<div class=page>
-  <h1>TOPS in the Cloud</h1>
-  <div class=metanav>
-    <a href="{{ url_for('home') }}">home</a>
-  </div>
+</head>
+<body>
+    <div class="navbar">
+      <div class="navbar-inner">
+        <div class="container">
+          <span class="brand" href="#">Total Open Station</span>
+
+	  <div class="nav-collapse">
+            <ul class="nav">
+		<li>
+                   <a href="{{ url_for('home') }}">Home</a>
+		</li>		
+            </ul>
+	  </div>
+        </div>
+
+      </div>
+    </div>
+
+<div class="container">
   {% for message in get_flashed_messages() %}
     <div class=flash>{{ message }}</div>
   {% endfor %}
   {% block body %}{% endblock %}
-</div>
-<footer>source code at <a href="https://bitbucket.org/steko/tops-cloud">bitbucket</a><br /><a href="http://flask.pocoo.org/"><img
-   src="http://flask.pocoo.org/static/badges/flask-powered.png"
-   border="0"
-   alt="Flask powered"
-   title="Flask powered"></a><a href="http://www.ep.io/"><img
-   src="https://www.ep.io/static//images/logo.png"
-   border="0"
-   alt="Python hosting by ep.io"
-   title="Python hosting by ep.io"></a></footer>
+
+</div>  <!-- /container -->
+</body>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.