changed templates regarding conrols section

ordr2/static/css/style.css

@@ -718,3 +718,7 @@ hgroup .info {
 	.page-controls h1 { font-size: 25px; }
 }
 
+
+/*================ STYLES FOR php2python BRANCH ================*/
+
+input[value="password:mapping"] + div { margin-bottom:10px; }

ordr2/templates/account/login.jinja2

@@ -4,7 +4,8 @@
 {% block subtitle %} Login {% endblock subtitle %}
 
 {% block content %}
-<div class="container">
+<div class="content">
+    <div class="container">
         <div class="row">
             <div class="span6 offset3">
                 <h1>Log in</h1>
@@ -33,5 +34,6 @@
                 </form>
             </div>
         </div>
+    </div>
 </div>
 {% endblock content %}

ordr2/templates/errors/forbidden.jinja2

@@ -3,7 +3,8 @@
 {% block subtitle %} Access Denied {% endblock subtitle %}
 
 {% block content %}
-<div class="container">
+<div class="content">
+    <div class="container">
         <div class="row">
 
             <div class="span12">
@@ -14,5 +15,6 @@
             </div>
 
         </div>
+    </div>
 </div>
 {% endblock content %}

ordr2/templates/errors/not_found.jinja2

@@ -3,7 +3,8 @@
 {% block subtitle %} Not Found {% endblock subtitle %}
 
 {% block content %}
-<div class="container">
+<div class="content">
+    <div class="container">
         <div class="row">
 
             <div class="span12">
@@ -14,5 +15,6 @@
             </div>
 
         </div>
+    </div>
 </div>
 {% endblock content %}

ordr2/templates/layout.jinja2

@@ -12,6 +12,7 @@
 	<link rel="stylesheet" href="{{request.static_url('ordr2:static/css/bootstrap.css')}}" type="text/css" media="screen">
 	<link rel="stylesheet" href="{{request.static_url('ordr2:static/css/bootstrap-responsive.css')}}" type="text/css" media="screen">
     <link rel="stylesheet" href="{{request.static_url('ordr2:static/css/style.css')}}" type="text/css" media="screen" />
+    <link rel="stylesheet" href="{{request.static_url('deform:static/css/form.css')}}" type="text/css" media="screen" />
   <!--[if !IE 7]>
 	<style type="text/css">
 		#wrap {display:table;height:100%}
@@ -46,7 +47,7 @@
                 </ul>
               {% else %}
                 <ul class="nav">
-                  <li {% if context.nav_highlight == 'register' %} class="active" {% endif %}><a href="{{request.resource_url(request.root, 'register')}}">Register</a></li>
+                  <li {% if context.nav_highlight == 'register' %} class="active" {% endif %}><a href="{{request.resource_url(request.root, 'account', 'register')}}">Register</a></li>
                   <li {% if context.nav_highlight == 'about'  %} class="active" {% endif %}><a href="{{request.resource_url(request.root, 'about')}}">About</a></li>
                 </ul>
                 <form action="{{request.resource_url(request.root, 'account', 'login')}}" method="post" class="navbar-form pull-right">
@@ -59,11 +60,11 @@
         </div>
       </div>
 </header>
-<div class="content {#<?php echo ($controls) ? ' controls' : ''; ?>#}">
+
-            {% block content %}
+{% block content %}
     <p>No content</p>
-            {% endblock content %}
+{% endblock content %}
-  </div>
+
   <footer>
 
     <div class="copy">

ordr2/templates/pages/faq.jinja2

@@ -3,7 +3,8 @@
 {% block subtitle %} FAQ {% endblock subtitle %}
 
 {% block content %}
-<div class="container">
+<div class="content">
+    <div class="container">
         <h1>Frequently Asked Questions</h1>
 
         <section>
@@ -70,5 +71,6 @@
                 </p>
             </div>
         </section>
+    </div>
 </div>
 {% endblock content %}

ordr2/templates/pages/welcome.jinja2

@@ -3,7 +3,8 @@
 {% block subtitle %} Welcome {% endblock subtitle %}
 
 {% block content %}
-<div class="container">
+<div class="content">
+    <div class="container">
 
         <div class="row">
             <div class="span12">
@@ -36,5 +37,6 @@
                 <p>As soons as your purchase has arrived you will automatically get notified. Or you can use the orders overview to check what the working status is.</p>
             </div>
         </div>
-
+    </div>
-</div>{% endblock content %}
+</div>
+{% endblock content %}