Module: nagvis Branch: master Commit: 074dbdef99f0cd77b3ed855be861cd773549578e URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=074dbdef99f0cd77b3ed855be861cd773549578e
Author: LaMi <[email protected]> Date: Sun Jan 10 18:05:04 2010 +0100 Changed stylings of wui dialogs --- share/frontend/wui/css/wui.css | 66 +------------------- share/frontend/wui/js/jsdomenu.inc.js | 2 +- share/server/core/classes/WuiViewEditMainCfg.php | 10 +++- share/userfiles/templates/default.css | 29 ++++++++- .../templates/default.wuiEditMainCfg.html | 4 +- 5 files changed, 38 insertions(+), 73 deletions(-) diff --git a/share/frontend/wui/css/wui.css b/share/frontend/wui/css/wui.css index 0c9c86f..c931c02 100644 --- a/share/frontend/wui/css/wui.css +++ b/share/frontend/wui/css/wui.css @@ -26,11 +26,6 @@ * @author Lars Michelsen <[email protected]> */ -table { - background-color: #F5F5F5; - width: 100%; -} - .main { margin: 0; padding: 0; @@ -41,9 +36,6 @@ table { font-weight: bold; color: #314455; vertical-align: middle; - - border: 1px solid #314455; - background-color: #DADADA; } .focus { @@ -55,62 +47,6 @@ table { } /* - * WUI tables/form - */ - -table.mytable { - background-color: #F5F5F5; - border-collapse:collapse; - margin-top: 0px; - padding: 1px; - width: 100%; -} - -table.mytable td, table.mytable th { - border: 1px #a4a4a4 solid; - padding: 1px; - - font-size: 10px; - color: #314455; -} - -/* title */ -table.mytable th { - background-color: #eee; - - text-align: center; - font-size: 12px; -} - -/* cat */ -table.mytable th.cat { - font-size: 12px; -} - -/* td common */ -table.mytable td { - color: #2B5377; -} - -/* Child rows */ -table.mytable tr.child-row td.tdlabel { - padding-left: 20px; -} - -/* td labels */ -table.mytable td.tdlabel { - padding-left: 10px; - background-color: #eee; - width: 50%; -} - -table.mytable td.tdfield input, table.mytable td.tdfield select { - background-color: #E4EEF6; - border: 1px solid #284279; - width: 100%; -} - -/* * WUI INFOBOX */ @@ -176,4 +112,4 @@ ul.nav li a span { display: inline; line-height: 34px; vertical-align: middle; -} \ No newline at end of file +} diff --git a/share/frontend/wui/js/jsdomenu.inc.js b/share/frontend/wui/js/jsdomenu.inc.js index 3a97dbc..66c09e8 100644 --- a/share/frontend/wui/js/jsdomenu.inc.js +++ b/share/frontend/wui/js/jsdomenu.inc.js @@ -51,7 +51,7 @@ function createjsDOMenu() { addMenuItem(new menuItem(get_label('properties'), "menu_properties", "code:popupWindow('"+get_label('properties')+"', getSyncRequest('./ajax_handler.php?action=getFormContents&form=addmodify&do=modify&map='+mapname+'&type=global&id=0', true, false));","","","")); addMenuItem(new menuItem(get_label('addObject'), "menu_addobject", "","","","")); addMenuItem(new menuItem("-")); - addMenuItem(new menuItem(get_label('nagVisConfig'), "", "code:popupWindow('"+get_label('nagVisConfig')+"', getSyncRequest('"+oGeneralProperties.path_server+"?mod=MainCfg&act=edit', true, false));")); + addMenuItem(new menuItem(get_label('nagVisConfig'), "", "code:popupWindow('"+get_label('nagVisConfig')+"', getSyncRequest('"+oGeneralProperties.path_server+"?mod=MainCfg&act=edit', true, false), undefined, 970);")); addMenuItem(new menuItem(get_label('manage'), "menu_management", "","","","")); } diff --git a/share/server/core/classes/WuiViewEditMainCfg.php b/share/server/core/classes/WuiViewEditMainCfg.php index 961eece..4692d98 100644 --- a/share/server/core/classes/WuiViewEditMainCfg.php +++ b/share/server/core/classes/WuiViewEditMainCfg.php @@ -73,10 +73,11 @@ class WuiViewEditMainCfg { function getFields() { $ret = ''; + $i = 1; foreach($this->CORE->getMainCfg()->getValidConfig() AS $cat => $arr) { // don't display backend,rotation and internal options if(!preg_match("/^backend/i", $cat) && !preg_match("/^internal$/i", $cat) && !preg_match("/^rotation/i", $cat)) { - $ret .= '<tr><th class="cat" colspan="3">'.$cat.'</th></tr>'; + $ret .= '<tr><th class="cat" colspan="3"><h2>'.$cat.'</h2></th></tr>'; foreach($arr AS $propname => $prop) { $class = ''; @@ -204,6 +205,13 @@ class WuiViewEditMainCfg { $ret .= '</tr>'; } } + + if($i % 3 == 0) { + $ret .= '</table><table class="mytable" style="width:300px;float:left">'; + } + + $i++; + } } diff --git a/share/userfiles/templates/default.css b/share/userfiles/templates/default.css index 4ebcd81..4f1e418 100644 --- a/share/userfiles/templates/default.css +++ b/share/userfiles/templates/default.css @@ -35,6 +35,8 @@ body, table, th, td { font-size: 12pt; } +table {width:100%;} + div { margin: 0; padding: 0; @@ -464,11 +466,7 @@ td#popupWindowContent table.mytable { td#popupWindowContent table.mytable tr th, td#popupWindowContent table.mytable tr td { - background-color: #eee; - border: 1px #a4a4a4 solid; - font-size: 10px; - font-weight: bold; color: #314455; } @@ -481,6 +479,29 @@ td#popupWindowContent p { margin-bottom: 12px; } +td#popupWindowContent table.mytable {border-collapse:collapse;margin-top: 0px;padding: 1px;} + +td#popupWindowContent table.mytable td, td#popupWindowContent table.mytable th {padding: 1px;font-size: 10px;color: #314455;} + +/* title */ +td#popupWindowContent table.mytable th { border:0;} + +td#popupWindowContent table.mytable th h2 {font-size:12px;text-align:center;background:#eee;padding:3px 10px 2px 20px;font-size:20px;line-height:30px;font-weight:normal;-moz-border-radius:8px;-webkit-border-radius:8px;text-shadow: 1px 1px 1px #bbbbbb;margin-bottom:5px;} + +/* cat */ +td#popupWindowContent table.mytable th.cat {font-size: 12px;} + +/* td common */ +td#popupWindowContent table.mytable td {color: #2B5377;} + +/* Child rows */ +td#popupWindowContent table.mytable tr.child-row td.tdlabel {padding-left: 20px;} + +/* td labels */ +td#popupWindowContent table.mytable td.tdlabel {padding-left: 10px;width: 50%;} + +td#popupWindowContent table.mytable tr td.tdfield input, td#popupWindowContent table.mytable tr td.tdfield select {font-size: 10px;background-color: #E4EEF6;border: 1px solid #284279;width: 100%;} + /* Popup window forms */ td#popupWindowContent fieldset { diff --git a/share/userfiles/templates/default.wuiEditMainCfg.html b/share/userfiles/templates/default.wuiEditMainCfg.html index 2cc7935..167d186 100644 --- a/share/userfiles/templates/default.wuiEditMainCfg.html +++ b/share/userfiles/templates/default.wuiEditMainCfg.html @@ -1,7 +1,7 @@ <script type="text/javascript" src="{$htmlBase}/frontend/wui/js/EditMainCfg.js"></script> <form name="edit_config" id="edit_config" action="javascript:submitFrontendForm('{$htmlBase}/server/core/ajax_handler.php?mod=MainCfg&act=doEdit', 'edit_config');" enctype="" > -<table name="mytable" class="mytable" id="table_edit_config"> +<table name="mytable" class="mytable" id="table_edit_config" style="width:300px;float:left;"> {$formContents} <tr><td class="tdlabel" colspan="3" align="center"><input class="submit" type="submit" name="submit" id="commit" value="{$langSave}" /></td></tr> </table> -</form> \ No newline at end of file +</form> ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
