Mercurial Mercurial > fis / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Twitter bootstrap integration
authorTomas Zeman <tzeman@volny.cz>
Thu, 12 Apr 2012 10:52:18 +0200
changeset 41 216eac8b08b4
parent 40 a2a452c1ed2c
child 42 7c811cdfa4c3
Twitter bootstrap integration
src/main/scala/bootstrap/liftweb/Boot.scala file | annotate | diff | comparison | revisions
src/main/webapp/css/base.css file | annotate | diff | comparison | revisions
src/main/webapp/entity/delete.html file | annotate | diff | comparison | revisions
src/main/webapp/entity/form.html file | annotate | diff | comparison | revisions
src/main/webapp/entity/list.html file | annotate | diff | comparison | revisions
src/main/webapp/entity/view.html file | annotate | diff | comparison | revisions
src/main/webapp/templates-hidden/default.html file | annotate | diff | comparison | revisions
src/main/webapp/templates-hidden/panel.html file | annotate | diff | comparison | revisions 
--- a/src/main/scala/bootstrap/liftweb/Boot.scala	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/scala/bootstrap/liftweb/Boot.scala	Thu Apr 12 10:52:18 2012 +0200
@@ -40,6 +40,9 @@
       Menu.i("Home") / "" , ContactSnippet.menu)
 
     LiftRules.setSiteMap(SiteMap(menus:_*))
+
+    LiftRules.htmlProperties.default.set { r: Req =>
+      Html5Properties(r.userAgent) }
   }
 }
 
--- a/src/main/webapp/css/base.css	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/css/base.css	Thu Apr 12 10:52:18 2012 +0200
@@ -27,11 +27,13 @@
 .attr-name {
   font-weight: bold;
   width: 150px;
+  text-align: justify;
 }
 
 .attr-name-wide {
   font-weight: bold;
   width: 230px;
+  text-align: justify;
 }
 
 .attr-value {
--- a/src/main/webapp/entity/delete.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/entity/delete.html	Thu Apr 12 10:52:18 2012 +0200
@@ -6,12 +6,11 @@
   </head>
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
-      <div class="span-24 last">
-        <h2><span class="lift:Menu.title"/></h2>
-      </div>
-      <div class="span-24 last">
-        <span class="lift:form"/>
-      </div>
+      <div class="row">
+        <div class="span12">
+          <span class="lift:form"></span>
+        </div>
+      </div> <!-- /row -->
     </div>
   </body>
 </html>
--- a/src/main/webapp/entity/form.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/entity/form.html	Thu Apr 12 10:52:18 2012 +0200
@@ -6,12 +6,11 @@
   </head>
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
-      <div class="span-24 last">
-        <h2><span class="lift:Menu.title"/></h2>
-      </div>
-      <div class="span-24 last">
-        <span class="lift:form"/>
-      </div>
+      <div class="row">
+        <div class="span12">
+          <span class="lift:form"></span>
+        </div>
+      </div> <!-- /row -->
     </div>
   </body>
 </html>
--- a/src/main/webapp/entity/list.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/entity/list.html	Thu Apr 12 10:52:18 2012 +0200
@@ -6,12 +6,11 @@
   </head>
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
-      <div class="span-24 last">
-        <h2><span class="lift:Menu.title"/></h2>
-      </div>
-      <div class="span-24 last">
-        <span class="lift:list"/>
-      </div>
+      <div class="row">
+        <div class="span12">
+          <span class="lift:list"></span>
+        </div>
+      </div> <!-- /row -->
     </div>
   </body>
 </html>
--- a/src/main/webapp/entity/view.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/entity/view.html	Thu Apr 12 10:52:18 2012 +0200
@@ -6,12 +6,11 @@
   </head>
   <body class="lift:content_id=main">
     <div id="main" class="lift:surround?with=default;at=content">
-      <div class="span-24 last">
-        <h2><span class="lift:Menu.title"/></h2>
-      </div>
-      <div class="span-24 last">
-        <span class="lift:panel"/>
-      </div>
+      <div class="row">
+        <div class="span12">
+          <span class="lift:panel"></span>
+        </div>
+      </div> <!-- /row -->
     </div>
   </body>
 </html>
--- a/src/main/webapp/templates-hidden/default.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/templates-hidden/default.html	Thu Apr 12 10:52:18 2012 +0200
@@ -1,13 +1,14 @@
+<!DOCTYPE html> 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="description" content="Functional Information System" />
     <meta name="keywords" content="information system, inventory, crm, service repository" />
-    <title class="lift:Menu.title"></title>
-    <style class="lift:CSS.blueprint"></style>
-    <style class="lift:CSS.fancyType"></style>
+    <title class="lift:menu.title"></title>
+    <link rel="stylesheet" href="/bootstrap/css/bootstrap.css" />
+    <link rel="stylesheet" href="/bootstrap/css/bootstrap-responsive.css" />
     <script id="jquery" src="/classpath/jquery.js" type="text/javascript"></script>
-    <script id="jquery" src="/js/jquery.dataTables.js" type="text/javascript"></script>
+    <script id="jquery.dataTables" src="/js/jquery.dataTables.js" type="text/javascript"></script>
     <script type="text/javascript">
       $(document).ready(function() {
         $('.datatable').dataTable();
@@ -17,23 +18,39 @@
   </head>
   <body>
     <div class="container">
-      <div class="column span-24 last" style="text-align: center">
-        <h1 class="alt">FIS</h1>
+      <div class="hero-unit">
+        <h1>Functional Information System</h1>
+        <p>Project management, CRM, ...</p>
+      </div>
+      <div id="topnav" class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <span class="lift:menu.builder?linkToSelf=true;li_item:class=active;top:class=nav" ></span>
+          </div>
+        </div>
       </div>
-      <hr />
-      <div class="column span-24 last">
-        <span class="lift:Menubar"></span>
+      <div id="secnav" class="row">
+        <ul>
+          <span class="lift:secnav"></span>
+        </ul>
       </div>
-      <div class="lift:Msgs?showAll=false column span-24 last"></div>
-      <div class="span-10 last lift:action-links.are">
-        <span class="lift:action-links"/>
+      <div class="lift:msgs?showAll=false row">
+        <lift:error_class>alert-error</lift:error_class>
+        <lift:warning_class>alert</lift:warning_class>
+        <lift:notice_class>alert-success</lift:notice_class>
+      </div>
+      <div class="row">
+        <div class="span12">
+          <h2><span class="lift:menu.title"></span></h2>
+        </div>
       </div>
       <div id="content"></div>
-      <hr />
-      <div class="column span-24 last" style="text-align: center">
-        <h4 class="alt"></h4>
-      </div>
-    </div>
+      <hr>
+      <footer>
+        <p>Copyright &copy; 2012 ... </p>
+      </footer>
+    </div> <!-- /container -->
+    <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
   </body>
 </html>
 
--- a/src/main/webapp/templates-hidden/panel.html	Tue Apr 03 15:55:54 2012 +0200
+++ b/src/main/webapp/templates-hidden/panel.html	Thu Apr 12 10:52:18 2012 +0200
@@ -1,6 +1,6 @@
 <table>
   <tr class="row">
-    <td class="n attr-name">Attribute</td>
+    <th class="n attr-name" scope="row">Attribute</td>
     <td class="v attr-value">Value</td>
   </tr>
 </table>
fis