Home Explore Help
Sign In
Ninjatrappeur
/
ffdn-db
forked from FFDN/ffdn-db
1
0
Fork 0
Files
Browse Source

More coherent layout & top margin

Gu1 11 years ago
parent
29895064c8
commit
177fea58fb
7 changed files with 15 additions and 13 deletions
Split View Show Diff Stats
  1. 1 1
      ffdnispdb/__init__.py
  2. 5 1
      ffdnispdb/static/css/style.css
  3. 1 1
      ffdnispdb/templates/index.html
  4. 5 6
      ffdnispdb/templates/layout.html
  5. 1 2
      ffdnispdb/templates/project_form.html
  6. 1 1
      ffdnispdb/templates/projects.html
  7. 1 1
      ffdnispdb/views.py

+ 1 - 1
ffdnispdb/__init__.py
View File 

@@ -4,7 +4,7 @@ from flask import Flask, g
 
 from flask.ext.babel import Babel
 
 import sqlite3
 
 
-app = Flask(__name__) 
+app = Flask(__name__)
 
 app.config.from_object('config')
 
 babel = Babel(app)

+ 5 - 1
ffdnispdb/static/css/style.css
View File 

@@ -9,10 +9,14 @@
 
     font-style: normal;
 
 }
 
 
-#homepage-body {
 
+#main-container {
 
     margin-top: 25px;
 
 }
 
 
+#main-container h2.page-header {
 
+    margin-top: 0;
 
+}
 
+
 
 #ffdn-header {
 
     font-family: ffdn;
 
     font-size: 24px;

+ 1 - 1
ffdnispdb/templates/index.html
View File 

@@ -1,7 +1,7 @@
 
 {% extends "layout.html" %}
 
 {% block container %}
 
   {% if error %}<p class=error><strong>Error:</strong> {{ error }}{% endif %}
 
-  <div class="row-fluid" id="homepage-body">
 
+  <div class="row-fluid">
 
     <div class="span9">
 
       <div id="map"></div>
 
     </div>

+ 5 - 6
ffdnispdb/templates/layout.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="fr">
 
   <head>
 
     <meta charset="utf-8">
 
-    <title>Fédéral Database</title>
 
+    <title>FFDN ISP Database</title>
 
     <!-- meta -->
 
     <!-- icon
 
     <link rel="shortcut icon" href="favicon.ico"> -->
 
@@ -30,7 +30,7 @@
 
           <li class="active">
 
           <a href="/">Home</a>
 
           </li>
 
-          <li><a href="#">Project List</a></li>
 
+          <li><a href="{{ url_for('project_list') }}">Project List</a></li>
 
           <li><a href="#">Schema</a></li>
 
           <li><a href="#">API</a></li>
 
         </ul>
 
@@ -39,9 +39,7 @@
 
   </div>
 
 </div>
 
 
-<div class="container">
 
-{% block container %}
 
-<h2 class="page-header">{% block subtitle %}{% endblock %}</h2>
 
+<div id="main-container" class="container">
 
 {% with messages = get_flashed_messages(with_categories="true") %}
 
   {% if messages %}
 
     {% for category, message in messages %}
 
@@ -52,7 +50,8 @@
 
     {% endfor %}
 
   {% endif %}
 
 {% endwith %}
 
-
 
+{%- block container %}
 
+<h2 class="page-header">{% block page_title %}{% endblock %}</h2>
 
 <div class="container">
 
 {% block body %}{% endblock %}
 
 </div>

+ 1 - 2
ffdnispdb/templates/project_form.html
View File 

@@ -23,8 +23,7 @@
 
           </div>
 
         </div>
 
 {%- endmacro %}
 
-{% block body %}
 
-
 
+{% block container %}
 
 <div class="row">
 
   <div class="span11 well">
 
     <form action="{{ url_for('create_project') }}" method="post" class="form-horizontal">

+ 1 - 1
ffdnispdb/templates/projects.html
View File 

@@ -1,5 +1,5 @@
 
 {% extends "layout.html" %}
 
-{% block subtitle %}
 
+{% block page_title %}
 
 Liste des projets recencés
 
 {% endblock %}
 
 {% block body %}

+ 1 - 1
ffdnispdb/views.py
View File 

@@ -23,7 +23,7 @@ def members():
 
     return render_template('members.html', members=members)
 
 
 @app.route('/projects')
 
-def projects():
 
+def project_list():
 
     projects = list()
 
     for project in query_db('select * from fai order by is_member desc,step desc,name'):
 
         project['stepname'] = STEPS[project['step']]