From: <dai...@us...> - 2012-08-02 10:50:29
|
Revision: 5583 http://web-erp.svn.sourceforge.net/web-erp/?rev=5583&view=rev Author: daintree Date: 2012-08-02 10:50:19 +0000 (Thu, 02 Aug 2012) Log Message: ----------- Hindra new wood mkII Modified Paths: -------------- trunk/api/api_debtortransactions.php trunk/css/wood/default.css trunk/css/wood/images/desk.jpg trunk/css/wood/images/wood.jpg trunk/css/wood/login.css Modified: trunk/api/api_debtortransactions.php =================================================================== --- trunk/api/api_debtortransactions.php 2012-07-31 20:08:18 UTC (rev 5582) +++ trunk/api/api_debtortransactions.php 2012-08-02 10:50:19 UTC (rev 5583) @@ -1325,7 +1325,7 @@ } $SQL = "SELECT id, rate, - ovamount+ovgst+ovidscount-alloc AS lefttoalloc + ovamount+ovgst+ovdiscount-alloc AS lefttoalloc FROM debtortrans WHERE debtorno='" . $AllocDetails['debtorno'] . "' AND type='" . $AllocDetails['type'] . "' @@ -1336,7 +1336,7 @@ $Errors[] = NoTransactionToAllocate; } - if ($LeftToAllocRow['lefttoalloc'] <= 0){ /* negative if there is owt to allocate */ + if ($LeftToAllocRow['lefttoalloc'] < 0){ /* negative if it is a positive receipt to allocate against invoices */ /*Now look for invoices with the same customerref to allocate to */ $SQL = "SELECT id, rate, @@ -1344,7 +1344,8 @@ FROM debtortrans WHERE debtorno='" . $AllocDetails['debtorno'] . "' AND type=10 - AND reference='" . $AllocDetails['customerref'] . "'"; + AND reference='" . $AllocDetails['customerref'] . "' + AND ovamount+ovgst+ovdiscount-alloc <0"; $Result = api_DB_query($SQL,$db); $OSInvRow = DB_fetch_array($Result); @@ -1361,7 +1362,7 @@ DB_Txn_Begin($db); /*Now insert the allocation records */ - $SQL = "INSERT INTO custallocs (amt, + $SQL = "INSERT INTO custallocns (amt, datealloc, transid_allocfrom, transid_allocto) @@ -1378,8 +1379,70 @@ WHERE id = '" . $OSInvRow['id'] . "'"; $Result = api_DB_query($SQL,$db,'','',true); } /*end if the exchange rates are the same so no diff on exchange */ + /*end if it is a normal allocation of receipt to invoice*/ + } elseif ($LeftToAllocRow['lefttoalloc']>0) { /* it is a payment - negative receipt - already checked type=12 need to find credit note to allocate to */ + /*Now look for credit notes type 11 with the same customerref to allocate to */ + $SQL = "SELECT id, + rate, + ovamount+ovgst+ovdiscount-alloc AS outstanding + FROM debtortrans + WHERE debtorno='" . $AllocDetails['debtorno'] . "' + AND type=11 + AND reference='" . $AllocDetails['customerref'] . "' + AND ovamount+ovgst+ovdiscount-alloc < 0"; + $Result = api_DB_query($SQL,$db); + if (DB_num_rows($Result)) { // then we need to cast the net further afield + $SQL = "SELECT id, + rate, + ovamount+ovgst+ovdiscount-alloc AS outstanding + FROM debtortrans + WHERE debtorno='" . $AllocDetails['debtorno'] . "' + AND type=12 + AND reference='" . $AllocDetails['customerref'] . "' + AND ovamount+ovgst+ovdiscount-alloc < 0"; + $Result = api_DB_query($SQL,$db); + } + $LeftToAllocate = $LeftToAllocRow['lefttoalloc']; + + DB_Txn_Begin($db); - }/*end if there is owt to allocation*/ + while ($OSCreditRow = DB_fetch_array($Result)){ + + if ($OSCreditRow['rate']==$LeftToAllocRow['rate'] + AND $OSCreditRow['outstanding']<0 + AND $LeftToAllocate > 0){ + + if ($OSCreditRow['outstanding']+$LeftToAllocate<=0){ + /*We can allocate the whole amount of the receipt */ + $AllocateAmount = $LeftToAlloc; + $LeftToAllocate =0; + } else { + /*We can only allocate the rest of the invoice outstanding */ + $AllocateAmount = -$OSCreditRow['outstanding']; + $LeftToAllocate -= $OSCreditRow['outstanding']; + } + + /*Now insert the allocation records */ + $SQL = "INSERT INTO custallocns (amt, + datealloc, + transid_allocfrom, + transid_allocto) + VALUE('" . $AllocateAmount . "', + '" . Date('Y-m-d') . "', + '" . $LeftToAllocRow['id'] . "', + '" . $OSCreditRow['id'] . "')"; + $Result = api_DB_query($SQL,$db,'','',true); + /*Now update the allocated amounts in the debtortrans for both transactions */ + $SQL = "UPDATE debtortrans SET alloc=alloc-" . $AllocateAmount . " + WHERE id = '" . $LeftToAllocRow['id'] . "'"; + $Result = api_DB_query($SQL,$db,'','',true); + $SQL = "UPDATE debtortrans SET alloc=alloc+" . $AllocateAmount . " + WHERE id = '" . $OSCreditRow['id'] . "'"; + $Result = api_DB_query($SQL,$db,'','',true); + + } + } //end loop around potential positive receipts not fully allocated already + } if (sizeof($Errors)==0) { $Result = DB_Txn_Commit($db); $Errors[0]=0; Modified: trunk/css/wood/default.css =================================================================== --- trunk/css/wood/default.css 2012-07-31 20:08:18 UTC (rev 5582) +++ trunk/css/wood/default.css 2012-08-02 10:50:19 UTC (rev 5583) @@ -1,329 +1,236 @@ -/*********************************** +/*** -"Wood" experimental theme for WebERP -by Hindra Joshua +"Wood" Theme for WebERP -************************************/ +v2, 2012-08-02 +by Hindra Joshua +Changes: +- Wood textures scaled down +- Add shadow effects +- Light color +- Some fixes + +***/ + + body{ font-family:Arial, Verdana, Helvetica, sans-serif; - font-size:8pt; + font-size:10px; margin:10px; - background:url(images/desk.jpg) saddlebrown; + background:url(images/desk.jpg) #631; } -/*a{ - color:blue; - text-decoration:none; +/*** default styles ***/ + +a { + color:black; + text-decoration:none; } -a:hover{ - color:red; +a:visited{ + color:black; text-decoration:underline; -}*/ -img{ - vertical-align:middle; } -table{ - margin:0 auto; - text-align:center; +a:hover{ + color:red; + text-decoration:underline; } +a:active{ + color:red; + text-decoration:underline; + background:#fc8; +} - -/*** CANVAS ***/ -#CanvasDiv{ - background:url(images/wood.jpg) repeat scroll 0 0 sandybrown; - border:medium outset sandybrown; - border-radius:15px 15px 15px 15px; - padding:5px; +img{ /* icon on page title, etc */ + border:none; + vertical-align:middle; } - -/*** HEADER *************************************************/ -#HeaderDiv{ +p.page_title_text { /* page title */ + color:black; + font-weight:bold; + margin:5px auto; + padding:10px; + text-align:center; } -#HeaderDiv a:link, a:visited{ - color: black; - font-weight: normal; - text-decoration: none; - border:2px outset sandybrown; - border-radius:10px; - padding-left:5px; - padding-right:5px; -} -#HeaderDiv a:hover{ - color: red; - text-decoration: none; - border:2px inset sandybrown; - border-radius:10px; - padding-left:5px; - padding-right:5px; -} -#HeaderWrapDiv{ -} -#AppInfoDiv{ - float:left; +table{ /* most data display/input used tables */ + background:none repeat scroll 0 0 white; + box-shadow:3px 3px 4px #663311; + margin:0 auto; + padding:3px; + text-align:center; + width:auto; + margin-bottom:10px; } -#AppInfoDiv{ - float:left; +table .selection{ /* nested table for more complex data display/input */ + background:#feb; + box-shadow:none; } -#AppInfoCompanyDiv{ - float:left; +th { /* table headers */ + font-weight: normal; + font-size: 10px; + background-color: #ffd980; + color: black; + text-align: center; } -#AppInfoUserDiv{ - float:left; +th.number { + text-align: right; + font-weight: normal; + background-color: #800000; + color: white; } -#AppInfoModuleDiv{ - font-weight:bold; - font-size:10pt; -} -#QuickMenuDiv{ - float:right; -} -#QuickMenuDiv ul{ - float:right; -} -#QuickMenuDiv ul li{ - display:inline; - margin: 0px 2px; - float: left; -} -/* That's it! All other 'header' styles outside this is NOT needed! */ - - -/*** BODY *********************************************************************/ - -#BodyDiv { - clear:both; +/*table detail items default format */ +td { + text-align: left; } -#BodyWrapDiv{ -/* text-align:center;*/ +td.select { + background-color:#ffb; } -#MainMenuDiv{ - float:left; - margin-left:0; - width:12%; - white-space:nowrap; +td.number { + text-align: right; } -#MainMenuDiv ul{ - margin:0; - padding:0; -} -#MainMenuDiv li{ - list-style:none; -} -.main_menu_unselected { - border:2px outset sandybrown; - border-radius:10px; - padding-left:5px; - padding-right:5px; - margin:2px; + +.centre{ /* used by buttons */ text-align:center; } -.main_menu_selected { - border:2px inset sandybrown; - border-radius:10px; - padding-left:5px; - padding-right:5px; - margin:2px; - text-align:center; -} -.main_menu_unselected:hover{ - border:2px inset sandybrown; - border-radius:10px; - padding-left:5px; - padding-right:5px; - margin:2px; - text-align:center; -} -.main_menu_selected:hover{ -} -.main_menu_unselected a{ - text-decoration:none; -} -.main_menu_unselected a:hover{ - color:red; -} -.main_menu_selected a{ - text-decoration:none; -} -.main_menu_selected a:hover{ - color:red; -} - -/************************************/ -#SubMenuDiv{ - border:2px inset sandybrown; - border-radius:15px 15px 15px 15px; - float:right; - list-style:none; - margin:0; - padding:5px;; - width:86%; - background:url(images/desk.jpg); +input { /* used for text box and buttons (buttons should have their own styles) */ + font-family: Arial, Verdana, Helvetica, sans-serif;; + font-size: 10px; } -#SubMenuDiv ul{ - margin:0; - padding:0; +input.number{ + text-align: right; } -#SubMenuDiv li{ - list-style:none; +input.image { + border-width:0px; + background-color: transparent; } - -#TransactionsDiv{ - background:peachpuff; - border:2px outset peachpuff; - border-radius:10px; - float:left; - list-style:none; - width:32%; - margin:3px; +input:hover{ + background:#fff791; } -#InquiriesDiv{ - background:peachpuff; - border:2px outset peachpuff; - border-radius:10px; - float:left; - list-style:none; - width:32%; - margin:3px; +select { /* drop down */ + font-family: Arial, Verdana, Helvetica, sans-serif;; + font-size: 10px; } -#MaintenanceDiv{ - background:peachpuff; - border:2px outset peachpuff; - border-radius:10px; - float:left; - list-style:none; - width:32%; - margin:3px; +select:hover { /* drop down */ + background:#fff791; } -.menu_group_headers { - background:saddlebrown; - border:2px outset saddlebrown; - border-radius:10px 10px 0 0; - padding:3px; - text-align:center; - color:white; +textarea{ + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 10px; } -/********************************************/ - -.BodyTbl{ - width:100%; +textarea:hover{ + background:#fff791; } -/*** main menu (at left) ****************************************/ -.main_menu { - outline:thin outset olivedrab; - background:olivedrab; -} - -.main_menu a { - color: lightgreen; - text-decoration:none; +.EvenTableRows { + background-color: #f5e6c9; } -.main_menu a:hover { - color: yellow; - text-decoration: none; +.OddTableRows { + background-color: #f2fac0; } -/**** CONTENT *********************************/ -table.selection { +div.error { + background-color:#fddbdb; + color: red; + border: 1px solid red; + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } - -.menu_group_headers table{ +div.warn { + background-color:#f5dbfd; + color: maroon; + border: 1px solid maroon; + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } -.menu_group_headers_text { +div.success { + background-color:#b9ecb4; + color: darkgreen; + border: 1px solid darkgreen; + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } -div.centre { - margin: 0 auto; - text-align:center; +div.info { + background-color:#C7CCF6; + border:0 solid navy; + color:navy; + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } -.menu_group_items { -} -.menu_group_item p { - color: saddlebrown; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */ - text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */ - margin: 0 0 0 12px; -} -.menu_group_item { - padding-top: 2px; - padding-bottom: 2px; - border:thin inset transparent; - border-radius:10px; - color:black; -} -.menu_group_item:hover{ - border:thin inset tan; - background:tan; - border-radius:10px; -} -.menu_group_item a{ - color:darkgreen; - text-decoration:none; -} -.menu_group_item a:hover{ - color:red; - text-decoration:none; -} +DIV.page_help_text { + background: lightgrey url(images/help.png) top left no-repeat; + BORDER: #a52a2a 1px solid; + padding-top:2px; + padding-bottom: 2px; + PADDING-LEFT: 10px; + Z-INDEX: 1; + FLOAT: none; + VISIBILITY: visible; + POSITION: static; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-weight: normal; + font-size: 10px; + color: black; + TEXT-ALIGN:center; - -/*** FOOTER **************************************************/ -#FooterDiv{ - clear:both; - color:black; - height:47px; + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } -#FooterWrapDiv{ - padding:5px; +DIV.system_check { + BORDER: #a52a2a 1px solid; + Z-INDEX: 1; + FLOAT: none; + VISIBILITY: visible; + POSITION: static; + background: lightgray; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-weight: normal; + font-size: 10px; + color: black; + TEXT-ALIGN:left; + + box-shadow:3px 3px 4px; + margin:0 auto 10px; + padding:10px; + width:80%; } -#FooterLogoDiv{ - background:white; - border:2px outset sandybrown; - border-radius:8px 8px 8px 8px; - float:left; - padding:5px; - margin-left:-9px; -} -#FooterVersionDiv{ - float:left; - margin-left:10px; - margin-top:15px; -} -#FooterTimeDiv{ - float:right; - margin-top:15px; -} -/* That's it! All other 'footer' styles outside this is NOT needed! */ - - -/************************************************************/ - -.dpTbl { - border: solid navy 1px; +p.good { + font-weight: bold; + color: green; } - -/*table detail items default format */ -td { - font-family: Arial, Verdana, Helvetica, sans-serif;; - font-size: 10px; - text-align: left; +p.bad { + font-weight: bold; + color:red; } -td.select { - background-color:#eee; -} +/*** date picker ***/ - +.dpTbl { /* date picker background */ + border:thin solid black; + background:white; + box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */ +} .dpTD { border: 0; width:20px; @@ -331,7 +238,6 @@ text-align:right; cursor:pointer; } - .dpDayHighlight { border: 0; width:20px; @@ -339,7 +245,6 @@ text-align:right; cursor:pointer; } - .dpTDHover { border: 0; width:20px; @@ -348,87 +253,11 @@ cursor:pointer; } -td.number { - text-align: right; -} -.EvenTableRows { - background-color: #f5e6c9; -} -.OddTableRows { - background-color: #f2fac0; -} -th { - font-weight: normal; - font-size: 10px; - background-color: #777C59; - color: white; - text-align: center; -} -th.number { - text-align: right; - font-weight: normal; - background-color: #800000; - color: white; -} -div.error { - background-color:#fddbdb; - color: red; - border: 1px solid red; -} -div.warn { - background-color:#f5dbfd; - color: maroon; - border: 1px solid maroon; -} -div.success { - background-color:#b9ecb4; - color: darkgreen; - border: 1px solid darkgreen; -} - -div.info { - background-color:#c7ccf6; - color: navy; - border: 0px solid navy; -} - -input { - font-family: Arial, Verdana, Helvetica, sans-serif;; - font-size: 10px; -} - -input.number{ - text-align: right; -} - -input.image { - border-width:0px; - background-color: transparent; -} - -input:hover{ -} - -select { - font-family: Arial, Verdana, Helvetica, sans-serif;; - font-size: 10px; -} - -p.good { - font-weight: bold; - color: green; -} - -p.bad { - font-weight: bold; - color:red; -} - #topMenu { width: 100%; color: black; @@ -479,25 +308,19 @@ border: none; } -textarea{ - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size: 10px; -} -textarea:hover{ -} /* Table type is used for UI tables type 1 */ .table1 { width:90%; background: #eee; - border: 0px 0px 2px 2px #222 solid; + border: 0px 0px 2px 2px solid #222; margin: 0 auto; } /* Table type is used for UI tables type 2 */ .table2 { width:90%; background: #eee; - border: 0px 0px 2px 2px #222 solid; + border: 0px 0px 2px 2px solid #222 ; margin: 0 auto; } input.address3 { @@ -536,225 +359,338 @@ /*top bar*/ +/*********************************************************/ -#quick_menu{ +span.main_menu_nolink { + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 10px; + font-weight: bold; + color: #777777; + text-decoration: none; + white-space: nowrap; } +input.big { + width: 100px; +} -/*the Select Customer / Item / Supplier Menu tabs */ -.system_menu_tabs { - background-color: #ffffff; - white-space: nowrap; - border: none; - margin-left: 6px; - margin-right: 6px; - margin-top: 0px; - margin-bottom: 0px; - padding: 0px; - text-align: center; +input.small { + width: 50px; } -.system_menu_tabs a { - font-size: 10px; - color: black; +input.inputerror { + background-color: #fddbdb; } -.system_menu_tabs a:hover { - font-size: 10px; - color: black; +textarea.texterror { + background-color: #fddbdb; } -.main_area { - border: 2px inset #ffffff; - width: 100%; - background-color: #ffffff; +select.selecterror { + background-color: #fddbdb; } - -/*********************************************************/ - - - -span.main_menu_nolink { - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #777777; - text-decoration: none; - white-space: nowrap; +.tableheader { + font-weight: normal; + background-color: #777C59; + color: white; } - -.menu_group_img { - background-color: lightgray; - text-align: center; - width: 90px; - position: relative; - left: 3px; +.notavailable { + font-weight:lighter; + font-style:italic; + color:#555555; } -.menu_group_img img{ - position: relative; - top: 10px; +.label { + font-weight:bold; + font-style:normal; + font-size:12px; + color:black; + background-color:#cccccc; } -.menu_group_area { - border: 0px inset #ffffff; + +.OsRow { + background-color: #234567; + color: white; } -.blank_area table { - border: 0px; - width: 100%; +.table_index { + background-color: #F1FFDD; } -p.page_title_text { - color:black; - font-weight:bold; - margin:5px auto; - text-align:center; - } +/*li { + list-style-image: url(bullet.gif); +}*/ -DIV.page_help_text { - background: lightgrey url(images/help.png) top left no-repeat; - BORDER: #a52a2a 1px solid; - padding-top:2px; - padding-bottom: 2px; - PADDING-LEFT: 10px; - Z-INDEX: 1; - width: 80%; - FLOAT: none; - VISIBILITY: visible; - MARGIN: 0 auto; - POSITION: static; - font-family: Arial, Verdana, Helvetica, sans-serif; - font-weight: normal; - font-size: 10px; - color: black; - TEXT-ALIGN:center; -} +/*** CANVAS ***/ -DIV.system_check { - BORDER: #a52a2a 1px solid; - PADDING-LEFT: 3px; - Z-INDEX: 1; - width: 40%; - FLOAT: none; - VISIBILITY: visible; - MARGIN: 0 auto; - POSITION: static; - background: lightgray; - font-family: Arial, Verdana, Helvetica, sans-serif; - padding-top: 1px; - padding-bottom: 1px; - font-weight: normal; - font-size: 10px; - color: black; - TEXT-ALIGN:left; +#CanvasDiv{ + background:url(images/wood.jpg) #feb; + border:medium outset #feb; + border-radius:15px 15px 15px 15px; + padding:3px; + box-shadow: 5px 5px 6px #000; /* modern browser only! */ } -span.menu_group_nolink { - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size: 10px; +/*** HEADER ***/ + +#HeaderDiv{ + color:black; + overflow:hidden; +} +#HeaderDiv a:link, a:visited{ + color: black; font-weight: normal; - color: #777777; text-decoration: none; + border:2px outset #feb; + border-radius:10px; + padding:3px 5px; + box-shadow:2px 2px 3px black; + margin-right:2px; } - -.menu_group_item a { +#HeaderDiv a:hover{ + color: black; font-weight: normal; + text-decoration: none; + border:2px outset #feb; + border-radius:10px; + padding:3px 5px; + color:red; + box-shadow:2px 2px 3px black; } +#HeaderDiv a:active{ + color: red; + text-decoration: none; + border:2px inset #feb; + border-radius:10px; + padding:3px 5px; + box-shadow:2px 2px 3px black inset; +} -.menu_group_items a:hover { - color: #0000aa; - text-decoration: underline; +#HeaderWrapDiv{ } +/*** HEADER - APP INFO ***/ -.legal { - font-family: Arial, Helvetica, sans-serif; - font-size: 9px; - color: #333333; +#AppInfoDiv{ + float:left; } - -.box1 { - border-color: #CCCCCC #333333 #333333 #CCCCCC; - border-width: medium; - border-style: ridge; +#AppInfoDiv{ + float:left; } - -.promo { - font-family: "Times New Roman", Times, serif; - color: #000033; +#AppInfoCompanyDiv{ + float:left; } - -.titlebar { - font-family: "Times New Roman", Times, serif; - font-size: 10px; - color: white; - background-color: #336699; +#AppInfoUserDiv{ + float:left; } +#AppInfoModuleDiv{ + font-weight:bold; + font-size:12px; +} -.dingbat { - font-family: Arial, Helvetica, sans-serif; - background-color: #99CC99; - color: #006666; - font-weight: bolder; - font-size: medium; +/*** HEADER - QUICK MENU ***/ + +#QuickMenuDiv{ + float:right; /* to the right side */ } +#QuickMenuDiv ul{ + list-style:none; /* hide the bullets */ +} +#QuickMenuDiv li{ + display:inline; /* items are inline */ +} +/*** BODY ***/ -input.big { - width: 100px; +#BodyDiv { + clear:both; + overflow:hidden; } +#BodyWrapDiv{ + color:black; +} -input.small { - width: 50px; +/*** BODY - MAIN MENU ***/ + +#MainMenuDiv{ + float:left; + white-space:nowrap; + text-align:center; + width:11%; +/* margin-left:0; */ } +#MainMenuDiv ul{ + margin:0 3px 0 0; + padding:0; +} +#MainMenuDiv li{ + list-style:none; /* REQUIRED */ + padding:0; /* REQUIRED */ +} -input.inputerror { - background-color: #fddbdb; +/* links as buttons */ + +#MainMenuDiv li a{ + border-radius:10px; + display:block; /* REQUIRED */ + padding:3px; + text-decoration:none; + color:black; + border:2px outset #feb; + box-shadow:2px 2px 3px black; + margin-top:2px; + margin-bottom:2px; } +#MainMenuDiv li a:hover{ + border-radius:10px; + display:block; /* REQUIRED */ + padding:3px; + text-decoration:none; + color:red; + border:2px outset #feb; +} +#MainMenuDiv li a:active{ /* pressed */ + border-radius:10px; + display:block; /* REQUIRED */ + padding:3px; + text-decoration:none; + color:red; + border:2px inset #feb; + box-shadow:2px 2px 3px black inset; + margin-top:2px; +} +#MainMenuDiv .main_menu_selected a{ /* the selected button */ + border-radius:10px; + display:block; /* REQUIRED */ + padding:3px; + text-decoration:none; + color:black; + border:2px inset #feb; + box-shadow:2px 2px 3px black inset; + margin-top:2px; +} +#MainMenuDiv .main_menu_selected a:hover{ /* the selected button, pressed */ + border-radius:10px; + display:block; /* REQUIRED */ + padding:3px; + text-decoration:none; + color:red; + border:2px inset #feb; + box-shadow:2px 2px 3px black inset; + margin-top:2px; +} -textarea.texterror { - background-color: #fddbdb; +/*** BODY - SUB MENU ***/ + +#SubMenuDiv{ + display:table; /* display as table, sub menu will auto adjust width */ + width:87%; /* main menu is 10% */ + border:3px inset #feb; + border-radius:15px 15px 15px 15px; + margin-left:auto; + margin-right:auto; + padding:5px; + background:url(images/desk.jpg); + box-shadow: 5px 5px 6px #000 inset; /* modern browser only! */ } +#SubMenuDiv ul{ + padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ + margin:5px; + background:/*url(images/wood.jpg) */#feb; + border:3px outset #feb; + border-radius:10px; + box-shadow: 5px 5px 6px #000; /* shadow: modern browser only! */ +} +#SubMenuDiv li{ + list-style:none; /* REQUIRED: hide bullets */ +} -select.selecterror { - background-color: #fddbdb; +.menu_group_headers { + background:/*url(images/desk.jpg) */#631; + border:3px outset #631; + border-radius:10px 10px 0 0; + padding:2px; + text-align:center; + color:white; + font-weight:bold; + margin-top:-3px; + margin-left:-3px; + margin-right:-3px; } -.tableheader { - font-weight: normal; - background-color: #777C59; - color: white; +.menu_group_item { + padding:2px; + border:thin inset transparent; + color:black; + border-radius:7px; } +.menu_group_item:hover{ + border:thin inset #ec9; + background:#ec9; + border-radius:7px; +} +.menu_group_item a{ + color:black; + text-decoration:none; +} +.menu_group_item a:hover{ + color:red; + text-decoration:none; +} -.notavailable { - font-weight:lighter; - font-style:italic; - color:#555555; +.menu_group_item p { + color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */ + text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */ + margin: 0 0 0 12px; } -.label { +#TransactionsDiv{ + display:table-cell; +} +#InquiriesDiv{ + display:table-cell; +} +#InquiriesDiv div{ /* header for custom reports/forms */ + background:#e9a77a; font-weight:bold; - font-style:normal; - font-size:12px; color:black; - background-color:#cccccc; + padding:2px; } +#MaintenanceDiv{ + display:table-cell; +} +/*** FOOTER ***/ -.OsRow { - background-color: #234567; - color: white; +#FooterDiv{ + clear:both; + color:black; + overflow:hidden; } - -.table_index { - background-color: #F1FFDD; +#FooterWrapDiv{ } - -li { - list-style-image: url(bullet.gif); +#FooterLogoDiv{ + background:white; + border:2px outset #feb; + border-radius:8px 8px 8px 8px; + float:left; + padding:3px; + margin-left:0px; + margin-top:3px; +} +#FooterVersionDiv{ + float:left; + margin-left:10px; + margin-top:17px; } +#FooterTimeDiv{ + float:right; + margin-top:17px; +} + +/*** END ***/ \ No newline at end of file Modified: trunk/css/wood/images/desk.jpg =================================================================== (Binary files differ) Modified: trunk/css/wood/images/wood.jpg =================================================================== (Binary files differ) Modified: trunk/css/wood/login.css =================================================================== --- trunk/css/wood/login.css 2012-07-31 20:08:18 UTC (rev 5582) +++ trunk/css/wood/login.css 2012-08-02 10:50:19 UTC (rev 5583) @@ -1,71 +1,81 @@ -/* $Id: login.css 4911 2012-02-15 16:52:21Z tim_schofield $*/ +/*** + +"Wood" Login theme for WebERP + +by Hindra Joshua + +***/ + + +/* $Id: login.css 4559 2011-05-01 09:45:18Z daintree $*/ body { - padding: 0px; - margin: 0px; - text-align: center; - font: 14px "Lucida Grande", "Arial", "Helvetica", "Verdana", "sans-serif"; - background: #fff; - color: #777; + background:url("images/desk.jpg") #663311; + color:black; + font:14px "Lucida Grande","Arial","Helvetica","Verdana","sans-serif"; + text-align:center; } +img{ + vertical-align:middle; +} + #container { - text-align: left; - margin-top: 0px; - margin-left: auto; - margin-right: auto; - position: relative; - z-index: 1000; - width: 300px; - background: #F1FFDD; + background:url("images/wood.jpg") repeat scroll 0 0 #FFEEBB; + border:medium outset #FFEEBB; + border-radius:15px 15px 15px 15px; + box-shadow:5px 5px 6px; + margin-left:auto; + margin-right:auto; + margin-top:50px; + width:300px; + z-index:1000; } #login_logo { - width: 200px; - height: 75px; - margin-left: 50px; - margin-top: 70px; - padding-top: 10px; - margin-bottom: 20px; - background: #fff url(../webERP.gif) repeat-x left bottom; +background:url("../webERP.gif") no-repeat scroll center center #FFFFFF; + border:medium outset gray; + border-radius:19px 19px 19px 19px; + height:44px; + margin:10% auto; + padding:12px; + width:190px; } -input{ - width: 200px; - border: solid #e3e3e3 1px; - height:25px; -/* background:url(images/input_bg.png) repeat-x left top; */ - padding:4px 0; - vertical-align:middle; - margin-left:50px; - margin-bottom:10px; +/*input{ + background:none repeat scroll 0 0 transparent; + border:thick outset #FFEEBB; + border-radius:15px 15px 15px 15px; + padding:10px; + vertical-align:middle; + width:50%; } input:hover { - border: solid #aad4e3 1px; - background-position:left bottom; -} + background:none repeat scroll 0 0 transparent; + border:thick inset #FFEEBB; + border-radius:15px 15px 15px 15px; + padding:10px; + vertical-align:middle; + width:50%; +}*/ input.button { - font-weight: bold; - color: #000; - background:#777C59; - border: solid #e3e3e3 1px; - padding: 0px; - margin-top: 10px; - margin-bottom: 30px; + background:none repeat scroll 0 0 transparent; + border:thick outset #FFEEBB; + border-radius:15px 15px 15px 15px; + padding:10px; + vertical-align:middle; + width:50%; + font-weight:bold; + box-shadow:3px 3px 4px; } input.button:hover { - background: #feeC59; + background:none repeat scroll 0 0 transparent; + border:thick inset #FFEEBB; + border-radius:15px 15px 15px 15px; + padding:10px; + vertical-align:middle; + width:50%; + box-shadow:3px 3px 4px inset; } - -label{ - width:200px; - padding-top:7px; - padding-left:50px; -} - -#demo_text{ - margin-left:50px; - width:200px; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |