admin based on bootstrap, thanks Paolo

2012-12-24 13:49:06 -06:00
parent 9981ae4d5f
commit ebda5cb2bc
112 changed files with 6839 additions and 1371 deletions
@@ -1,25 +1,21 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}resolve{{end}}
-
+<!-- begin "resolve" block -->
 <h2>{{=T('Resolve Conflict file')}} "{{=filename}}"</h2>
-
 <script>
 function plus() {jQuery('.plus').show(); jQuery('.minus').hide(); }
 function minus() {jQuery('.plus').hide(); jQuery('.minus').show(); }
 function all() {jQuery('.plus').show(); jQuery('.minus').show(); }
 </script>
-
 <div class="controls">
-<button onclick="plus()">new</button>
-<button onclick="minus()">old</button>
-<button onclick="all()">all</button>
+<button class="btn" onclick="plus()">new</button>
+<button class="btn" onclick="minus()">old</button>
+<button class="btn" onclick="all()">all</button>
 </div>
-
 <div class="form">
  <form action="{{=URL(r=request,args=request.args)}}" method="post">
    {{=diff}}
-    <input type="submit" name="merge" value="{{=T('merge')}}" /><br/>
+    <input class="btn" type="submit" name="merge" value="{{=T('merge')}}" /><br/>
  </form>
 </div>
-
+<!-- end "resolve" block -->