Adds side bar into layout.

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
mkouhei · Jun 21, 2015 · cff4630 · cff4630
1 parent 541b0b5
commit cff4630
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/pgraph/templates/graph.pt b/pgraph/templates/graph.pt
@@ -18,7 +18,7 @@
           </li>
         </ul>
       </div>
-      <div class="col-md-12">
+      <div class="col-md-8">
         <div class="content">
           <div id="graph"></div>
           <div id="message">

diff --git a/pgraph/templates/index.pt b/pgraph/templates/index.pt
@@ -1,17 +1,13 @@
 <metal:block use-macro="view.layout">
   <div metal:fill-slot="content">
     <div class="row">
-      <div class="col-md-2"></div>
       <div class="col-md-10">
-        <div class="content">
-          <h1><span class="font-semi-bold">pgraph</span></h1>
-          <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;graph of Python packages dependencies&nbsp;.</p>
-
-            <form class="input-group col-md-8" action="/search">
-              <input name="pkg_name" type="text" class="form-control" placeholder="search packages" aria-describedby="search-addon"  />
-              <span class="input-group-addon" id="search-addon"><icon class="glyphicon glyphicon-search"/></span>
-            </form>
-        </div>
+        <h1><span class="font-semi-bold">pgraph</span></h1>
+        <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;graph of Python packages dependencies&nbsp;.</p>
+        <form class="input-group col-md-8" action="/search">
+          <input name="pkg_name" type="text" class="form-control" placeholder="search packages" aria-describedby="search-addon"  />
+          <span class="input-group-addon" id="search-addon"><icon class="glyphicon glyphicon-search"/></span>
+        </form>
       </div>
     </div>
   </div>

diff --git a/pgraph/templates/layout.pt b/pgraph/templates/layout.pt
@@ -50,28 +50,25 @@
         </nav>
     </div>
     </header>
-
+    <div class="col-md-2" id="side-bar">
+    </div>
     <div class="container">
       <div metal:define-slot="content"></div>
-
       <hr/>
 
       <footer class="bs-docs-footer">
-        <div class="container">
-          <div class="copyright text-center">
-            <ul class="bs-docs-footer-links text-muted list-inline">
-              <li>Currently <a href="https://pypi.python.org/pypi/pgraph/">${project} ${version}</a></li>
-              <li><a href="${repo}" title="Git repo">Git repo</a></li>
-              <li><a href="${repo}/issues" title="Issues">Issues</a></li>
-              <li><a href="${docs}" title="docs">Docs</a></li>
-            </ul>
-            <p>&copy; Copyright 2015, ${author}.
+        <div class="copyright text-center">
+          <ul class="bs-docs-footer-links text-muted list-inline">
+            <li>Currently <a href="https://pypi.python.org/pypi/pgraph/">${project} ${version}</a></li>
+            <li><a href="${repo}" title="Git repo">Git repo</a></li>
+            <li><a href="${repo}/issues" title="Issues">Issues</a></li>
+            <li><a href="${docs}" title="docs">Docs</a></li>
+          </ul>
+          <p>&copy; Copyright 2015, ${author}.
             Powered by <a href="https://github.com/mkouhei/py-deps">py-deps</a>, <a href="https://github.com/mtoshi/linkdraw/wiki">Linkdraw</a>, <a href="http://www.celeryproject.org/">Celery</a> and <a href="http://docs.pylonsproject.org/en/latest/docs/pyramid.html">Pyramid</a>.</p>
-          </div>
         </div>
       </footer>
     </div>
-
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/pgraph/templates/search.pt b/pgraph/templates/search.pt
@@ -1,7 +1,7 @@
 <div metal:use-macro="view.layout">
   <div metal:fill-slot="content">
     <div class="row">
-      <div class="content">
+      <div class="col-md-10">
         <h2>Search &quot;${pkg_name}&quot; on PyPI</h2>
         <div class="table-responsive">
           <table class="table table-striped">