From 5decd2180de462bd711b984fc7888b425df18b32 Mon Sep 17 00:00:00 2001
From: Artyom Olshevskiy <siasia@siasia.(none)>
Date: Tue, 11 May 2010 19:58:41 +0300
Subject: [PATCH] Tables restyled

---
 .../scala/net/dataminer/model/FixedCRUDify.scala   |   7 ++--
 src/main/scala/net/dataminer/model/Miner.scala     |   9 +++++
 src/main/scala/net/dataminer/snippet/Miners.scala  |  19 ++++++++++
 src/main/webapp/index.html                         |  25 +++++++++++++
 src/main/webapp/media/css/style.css                |  11 +++++-
 src/main/webapp/media/css/table.css                |  39 +++++++++++++++++++++
 src/main/webapp/media/img/header-bg.png            | Bin 0 -> 173 bytes
 src/main/webapp/media/img/table/gradback.png       | Bin 0 -> 166 bytes
 src/main/webapp/media/img/table/gradhead.png       | Bin 0 -> 134 bytes
 src/main/webapp/media/img/table/gradhover.png      | Bin 0 -> 162 bytes
 src/main/webapp/templates-hidden/default.html      |   5 +--
 11 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 src/main/scala/net/dataminer/snippet/Miners.scala
 create mode 100644 src/main/webapp/media/css/table.css
 create mode 100644 src/main/webapp/media/img/header-bg.png
 create mode 100644 src/main/webapp/media/img/table/gradback.png
 create mode 100644 src/main/webapp/media/img/table/gradhead.png
 create mode 100644 src/main/webapp/media/img/table/gradhover.png

diff --git a/src/main/scala/net/dataminer/model/FixedCRUDify.scala b/src/main/scala/net/dataminer/model/FixedCRUDify.scala
index 56aa681..3153793 100644
--- a/src/main/scala/net/dataminer/model/FixedCRUDify.scala
+++ b/src/main/scala/net/dataminer/model/FixedCRUDify.scala
@@ -5,7 +5,8 @@ import _root_.net.liftweb.sitemap.Loc._
 
 trait FixedCRUDify[KeyType, CrudType <: KeyedMapper[KeyType, CrudType]] extends CRUDify[KeyType, CrudType] {
   self: CrudType with KeyedMetaMapper[KeyType, CrudType] => 
-  override def viewMenuLocParams = Hidden :: super.viewMenuLocParams
-  override def editMenuLocParams = Hidden :: super.editMenuLocParams
-  override def deleteMenuLocParams = Hidden :: super.deleteMenuLocParams
+  override val viewMenuLocParams = Hidden :: super.viewMenuLocParams
+  override val editMenuLocParams = Hidden :: super.editMenuLocParams
+  override val deleteMenuLocParams = Hidden :: super.deleteMenuLocParams
+  override val showAllClass = super.showAllClass + " styled-table"
 }
diff --git a/src/main/scala/net/dataminer/model/Miner.scala b/src/main/scala/net/dataminer/model/Miner.scala
index 0ab7335..1d61bd5 100644
--- a/src/main/scala/net/dataminer/model/Miner.scala
+++ b/src/main/scala/net/dataminer/model/Miner.scala
@@ -1,5 +1,11 @@
 package net.dataminer.model
 
+import _root_.net.liftweb.http._
+import S._
+import _root_.net.liftweb.util._
+import Helpers._
+import _root_.scala.xml._
+
 import _root_.net.liftweb.mapper._
 import _root_.net.liftweb.common._
 
@@ -16,4 +22,7 @@ object Miner extends Miner with LongKeyedMetaMapper[Miner] with FixedCRUDify[Lon
   override def dbTableName = "miners"
   override def fieldOrder = id :: name :: url_template :: override_function :: user :: Nil
   override def fieldsForList = name :: url_template :: override_function :: user :: Nil
+  override def viewTemplate = pageWrapper(
+    _viewTemplate.toSeq ++
+    <button>Mine</button>)
 }
diff --git a/src/main/scala/net/dataminer/snippet/Miners.scala b/src/main/scala/net/dataminer/snippet/Miners.scala
new file mode 100644
index 0000000..37cb9d7
--- /dev/null
+++ b/src/main/scala/net/dataminer/snippet/Miners.scala
@@ -0,0 +1,19 @@
+package net.dataminer.snippet
+
+import _root_.net.liftweb.util._
+import Helpers._
+import _root_.net.liftweb.http._
+import _root_.scala.xml._
+import _root_.net.liftweb.mapper._
+import _root_.net.dataminer.model._
+
+class Miners {
+  def latest(in: NodeSeq): NodeSeq = {
+    val miners = Miner.findAll(MaxRows(5)).flatMap {miner => 
+      bind(
+	"entry", chooseTemplate("miner", "entry", in),
+	"href" -> SHtml.link("/miners/view/" + miner.id, () => (), Text(miner.name)),
+	"user" -> miner.user.obj.map(_.email.toString).open_!)}
+    bind("miners", in, "entries" -> miners)
+  }    
+}
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index a755d43..d896056 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -1,3 +1,28 @@
 <lift:surround with="default" at="content">  
+  <lift:Miners.latest>
+    <h2>Latest miners</h2>
+    <table class="styled-table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Added by</th>
+        </tr>
+      </thead>
+      <tbody>
+        <miners:entries>
+          <miner:entry>
+            <tr>
+              <td>
+                <entry:href />
+              </td>
+              <td>
+                <entry:user />
+              </td>
+            </tr>
+          </miner:entry>
+        </miners:entries>
+      </tbody>
+    </table>
+  </lift:Miners.latest>
 </lift:surround>
 
diff --git a/src/main/webapp/media/css/style.css b/src/main/webapp/media/css/style.css
index 2442067..599529c 100644
--- a/src/main/webapp/media/css/style.css
+++ b/src/main/webapp/media/css/style.css
@@ -57,10 +57,19 @@ body {
 }
 #main {
   margin-left: 200px;
-  padding: 1px 5px 0 5px;
+  padding: 0;
+}
+#main #content {
+  padding: 5px;
 }
 #main h1 {
+  background-image: url(../img/header-bg.png);
+  padding: 0 5px;
   margin: 0;
   font-size: 14pt;  
   border-bottom: 1px solid black;
+}
+#main h2 {
+  font-size: 13pt;
+  margin: 0;
 }
\ No newline at end of file
diff --git a/src/main/webapp/media/css/table.css b/src/main/webapp/media/css/table.css
new file mode 100644
index 0000000..bcd0a25
--- /dev/null
+++ b/src/main/webapp/media/css/table.css
@@ -0,0 +1,39 @@
+.styled-table
+{
+  font-size: 12px;
+  width: 480px;
+  text-align: left;
+  border-collapse: collapse;
+}
+.styled-table th
+{
+  font-size: 13px;
+  font-weight: normal;
+  padding: 8px;
+  background: #b9c9fe url('../img/table/gradhead.png') repeat-x;
+  border-top: 2px solid #d3ddff;
+  border-bottom: 1px solid #fff;
+  color: #039;
+}
+.styled-table td
+{
+  padding: 8px; 
+  border-bottom: 1px solid #fff;
+  color: #669;
+  border-top: 1px solid #fff;
+  background: #e8edff url('../img/table/gradback.png') repeat-x;
+}
+.styled-table tfoot tr td
+{
+  background: #e8edff;
+  font-size: 12px;
+  color: #99c;
+}
+.show_all.styled-table tfoot tr td {
+  background: none;
+}
+.styled-table tbody tr:hover td
+{
+  background: #d0dafd url('../img/table/gradhover.png') repeat-x;
+  color: #339;
+}
\ No newline at end of file
diff --git a/src/main/webapp/media/img/header-bg.png b/src/main/webapp/media/img/header-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5871f783ff4ff045980952f5b16b3b5ed975d16d
GIT binary patch
literal 173
zcwXxa@N?(olHy`uVBq!ia0vp^j6f{L!3JU-`?d;16$iOHF|0c$^AgD6Ebxdd1}eS|
z!i-KDvnzmt>?NMQuI#s1xdjBY-kyJ&4-}Ftag8W(&d<$F%`0JWE=o--Nlj5G&n(GM
zaQE~L2yf&Q2P%^Cba4#fxSsst)vI6UkDNJkronH+h7AS*(M$~9EX)%H*w6L>RWW$F
L`njxgN@xNAg-S9i

literal 0
HcwPel00001

diff --git a/src/main/webapp/media/img/table/gradback.png b/src/main/webapp/media/img/table/gradback.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f428890432ad299ec1d3507143022e90448e6b3
GIT binary patch
literal 166
zcwXxa@N?(olHy`uVBq!ia0vp^j6kfw!2~2@+FN~rlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlA`ed&$B>F!HHS~~HYhN-9=u-PC>8E-^G?<er!NmqdbS<w
zxYl*9vrh1^mYe=Eg=d#s5+@ftopjoFP5%Dw0QvI~^Ob6!z5cFyfI(Fz(&PDT-xokL
O89ZJ6T-G@yGywp++dVx1

literal 0
HcwPel00001

diff --git a/src/main/webapp/media/img/table/gradhead.png b/src/main/webapp/media/img/table/gradhead.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d9b14d0233ab05b24c91a2d665d24c943e445b4
GIT binary patch
literal 134
zcwXxa@N?(olHy`uVBq!ia0vp^j6kf&!2~3y-wt~Lq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6=`_7IEGZ*N}93%tGqC`F|)9-FpIHbvYQ6mCP~SKGZ>wW
f4FY(XStJ+&Z!sN=baIIY>S6G7^>bP0l+XkKr|u&2

literal 0
HcwPel00001

diff --git a/src/main/webapp/media/img/table/gradhover.png b/src/main/webapp/media/img/table/gradhover.png
new file mode 100644
index 0000000000000000000000000000000000000000..957fd7fdfa225174e308e10fdf5f17c6e3a6e4e4
GIT binary patch
literal 162
zcwXxa@N?(olHy`uVBq!ia0vp^j6kfw!2~2@+FN~rlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlA{S2=$B>F!OOBr8Z7>jEIr#0_d?9^qmKlfHj)-=<Clx;k
z)S4Bd%W`Ip|Cy=VI`V}7>a{udET5rgct5G|_2amS|9`VcFa)Uk#6Q0OvKnX}gQu&X
J%Q~loCII3nH>&^u

literal 0
HcwPel00001

diff --git a/src/main/webapp/templates-hidden/default.html b/src/main/webapp/templates-hidden/default.html
index 91236b5..c28105a 100644
--- a/src/main/webapp/templates-hidden/default.html
+++ b/src/main/webapp/templates-hidden/default.html
@@ -4,8 +4,9 @@
     <meta name="description" content="" />
     <meta name="keywords" content="" />    
     <title><lift:Menu.title /></title>
-    <script id="jquery" src="/classpath/jquery.js" type="text/javascript"></script>
-    <link rel="stylesheet" type="text/css" media="screen" href="/media/css/style.css" />
+    <lift:Media.js resource="true" src="jquery" />
+    <lift:Media.css href="css/style" />
+    <lift:Media.css href="css/table" />
   </head>
   <body>
     <div id="wrapper">
-- 
2.11.4.GIT