urls fixed in admin

prasincs · Apr 2, 2010 · 166a5f4 · 166a5f4
1 parent 3d980d1
commit 166a5f4
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/lift_proto.db.h2.db b/lift_proto.db.h2.db
diff --git a/lift_proto.db.lock.db b/lift_proto.db.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Thu Apr 01 21:15:34 EST 2010
-id=127bc4d41a597831b676da3cb4a487404399335545b
+#Fri Apr 02 01:22:49 EDT 2010
+id=127bcf8b3140fa16642d93df46d96eb63b4bb84d764
 method=file
diff --git a/src/main/scala/com/angryfissure/model/User.scala b/src/main/scala/com/angryfissure/model/User.scala
@@ -80,7 +80,7 @@ class User extends MegaProtoUser[User] {
   object role extends MappedEnum(this, Role){
     override def defaultValue = Role.User
   }
-
+ 
 }
 
 object Role extends Enumeration {

diff --git a/src/main/scala/com/angryfissure/snippet/AdminSnip.scala b/src/main/scala/com/angryfissure/snippet/AdminSnip.scala
@@ -39,11 +39,11 @@ class AdminSnip {
                      "deserved" -> fml.deserved,
                      "approved" -> approvedCheckBox(fml),
                      FuncAttrBindParam("view_href", _ =>
-                       Text("view/"+ (fml.id)),"href"),
+                       Text("/fmls/view/"+ (fml.id)),"href"),
                      FuncAttrBindParam("edit_href", _ =>
-                   Text("edit/"+ (fml.id)),"href"),
+                   Text("/fmls/edit/"+ (fml.id)),"href"),
                     FuncAttrBindParam("delete_href", _ =>
-                        Text("delete/"+ (fml.id)),"href"))
+                        Text("/fmls/delete/"+ (fml.id)),"href"))
 
   private def doListFmls(reDraw: () => JsCmd)(html: NodeSeq): NodeSeq =
 	 getFmls.
@@ -82,11 +82,11 @@ private def bindUser(user:User, html: NodeSeq, reDraw: () => JsCmd) ={
         //user.role(Role.valueOf(selected.toString) getOrElse).save; 
         Run("alert('test')")}),
 	FuncAttrBindParam("view_href", _ =>
-          Text("view/"+ (user.id)),"href"),
+          Text("/user_mgmt/view/"+ (user.id)),"href"),
         FuncAttrBindParam("edit_href", _ =>
-          Text("edit/"+ (user.id)),"href"),
+          Text("/user_mgmt/edit/"+ (user.id)),"href"),
         FuncAttrBindParam("delete_href", _ =>
-          Text("delete/"+ (user.id)),"href"))
+          Text("/user_mgmt/delete/"+ (user.id)),"href"))
       }
 
 private def doListAllUsers(reDraw: ()=> JsCmd)(html:NodeSeq): NodeSeq = 

diff --git a/src/main/webapp/css/fml.css b/src/main/webapp/css/fml.css
@@ -95,3 +95,6 @@ li.current a, a:visited, a:link {
 	color: #EDFF91;
 }
 
+#admin-content {
+    background-color:#FFF;
+}
diff --git a/src/main/webapp/templates-hidden/admin_template.html b/src/main/webapp/templates-hidden/admin_template.html
@@ -27,7 +27,7 @@ <h1><a href="/admin" class="alt" id="logo">trincollFML:Admin</a></h1>
           <lift:snippet type="msgs"/>
       </div>
 
-      <div>
+      <div id="admin-content">
         <lift:bind name="content" />
       </div>
 

diff --git a/target/classes/bootstrap/liftweb/Boot$$anonfun$boot$1.class b/target/classes/bootstrap/liftweb/Boot$$anonfun$boot$1.class
diff --git a/target/classes/bootstrap/liftweb/Boot.class b/target/classes/bootstrap/liftweb/Boot.class
diff --git a/target/classes/com/angryfissure/model/User$.class b/target/classes/com/angryfissure/model/User$.class
diff --git a/target/classes/com/angryfissure/model/User.class b/target/classes/com/angryfissure/model/User.class