commit ad20698640d6a9ae3d491ebcff3050911de28b7b
parent 506f567e7e7cd2b3ada597f7b46d764067bc3718
Author: Alexander Burger <abu@software-lab.de>
Date: Fri, 31 May 2013 09:55:25 +0200
Changed all applications to using <layout>
Diffstat:
| M | app/gui.l | | | 41 | ++++++++++++++++++++++------------------- |
| M | lib.css | | | 24 | ++++++++---------------- |
2 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/app/gui.l b/app/gui.l
@@ -1,28 +1,31 @@
-# 20feb13abu
+# 31may13abu
# (c) Software Lab. Alexander Burger
### GUI ###
(de menu (Ttl . Prg)
(action
(html 0 Ttl *Css NIL
- (<div> '(id . menu)
- (expires)
- (<menu>
- (,"Home" "!start")
- (,"logout" (and *Login "!stop"))
- (NIL (<hr>))
- (T ,"Data"
- (,"Orders" (and (may Order) "app/ord.l"))
- (,"Items" (and (may Item) "app/item.l"))
- (,"Customers/Suppliers" (and (may Customer) "app/cusu.l"))
- (,"Salutations" (and (may Customer) "app/sal.l")) )
- (T ,"Report"
- (,"Inventory" (and (may Report) "app/inventory.l"))
- (,"Sales" (and (may Report) "app/sales.l")) )
- (T ,"System"
- (,"Role Administration" (and (may RoleAdmin) "app/role.l"))
- (,"User Administration" (and (may UserAdmin) "app/user.l")) ) ) )
- (<div> '(id . main) (run Prg 1)) ) ) )
+ (<layout>
+ ((180 NIL 'menu)
+ (<div> @
+ (expires)
+ (<menu>
+ (,"Home" "!start")
+ (,"logout" (and *Login "!stop"))
+ (NIL (<hr>))
+ (T ,"Data"
+ (,"Orders" (and (may Order) "app/ord.l"))
+ (,"Items" (and (may Item) "app/item.l"))
+ (,"Customers/Suppliers" (and (may Customer) "app/cusu.l"))
+ (,"Salutations" (and (may Customer) "app/sal.l")) )
+ (T ,"Report"
+ (,"Inventory" (and (may Report) "app/inventory.l"))
+ (,"Sales" (and (may Report) "app/sales.l")) )
+ (T ,"System"
+ (,"Role Administration" (and (may RoleAdmin) "app/role.l"))
+ (,"User Administration" (and (may UserAdmin) "app/user.l")) ) ) )
+ ((NIL NIL 'main)
+ (<div> @ (run Prg 1)) ) ) ) ) ) )
(de start ()
(setq *Url "!start")
diff --git a/lib.css b/lib.css
@@ -1,4 +1,4 @@
-/* 14mar13abu
+/* 31may13abu
* 17nov12jk
* (c) Software Lab. Alexander Burger
*/
@@ -79,33 +79,28 @@ a:hover {
}
/* Navigation */
-#menu {
- position: absolute;
- top: 0;
- left: 0;
- width: 18em;
- min-height: 100%;
+.menu {
padding-top: 2ex;
background-color: #d0d0d0;
}
-#menu ul {
+.menu ul {
list-style: none;
padding: 0;
margin: 0;
}
-#menu .cmd1, .act1, .cmd2, .act2, .cmd3, .act3, .cmd4, .act4 {
+.menu .cmd1, .act1, .cmd2, .act2, .cmd3, .act3, .cmd4, .act4 {
list-style-position: inside;
list-style-type: circle;
padding: 0 0 0 2em;
}
-#menu .act1, .act2, .act3, .act4 {
+.menu .act1, .act2, .act3, .act4 {
list-style-type: disc;
}
-#menu .sub1, .top1, .sub2, .top2, .sub3, .top3, .sub4, .top4 {
+.menu .sub1, .top1, .sub2, .top2, .sub3, .top3, .sub4, .top4 {
list-style-position: inside;
padding: 0 0 0 1em;
}
@@ -140,11 +135,8 @@ a:hover {
}
/* Main area */
-#main {
- position: absolute;
- top: 0;
- left: 19em;
- padding: 1ex 0;
+.main {
+ padding: 1ex 0 0 2ex;
}
/* Charts */
