From aae84a1a1db5c1d9fdfd5b068645937cc583dda4 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Mon, 19 May 2014 23:25:10 +0200 Subject: [PATCH] * Minor tweaks to new grid account search style * Fixed exposed IP address on event log in demo mode --- ajax/ajax_search.php | 7 ++- css/search-grid.css | 7 +-- css/styles.css | 144 ++++++++++++++++++++++--------------------- inc/tpl/eventlog.php | 2 +- 4 files changed, 81 insertions(+), 79 deletions(-) diff --git a/ajax/ajax_search.php b/ajax/ajax_search.php index 2948ec19..ddd8e20f 100644 --- a/ajax/ajax_search.php +++ b/ajax/ajax_search.php @@ -51,7 +51,8 @@ if ($wikiEnabled) { $wikiPageUrl = SP_Config::getValue('wiki_pageurl'); } $requestEnabled = SP_Util::mailrequestIsEnabled(); -$maxTextLength = (SP_Util::resultsCardsIsEnabled()) ? 30 : 60; +$maxTextLength = (SP_Util::resultsCardsIsEnabled()) ? 40 : 60; +$isDemoMode = SP_Util::demoIsEnabled(); // Valores POST $sortKey = SP_Common::parseParams('p', 'skey', 0); @@ -305,9 +306,9 @@ foreach ($resQuery as $account) { } echo ''; - } elseif ($requestEnabled) { + } elseif ($requestEnabled || $isDemoMode) { echo '
'; - echo '
'; + echo ''; } diff --git a/css/search-grid.css b/css/search-grid.css index 442fee0c..09f8203a 100644 --- a/css/search-grid.css +++ b/css/search-grid.css @@ -21,9 +21,8 @@ #content #data-search .account-label .field-text a{color: #4895FA} #content #data-search .account-label .no-link a{color: white; font-weight: bold;} -#content #data-search .field-customer .field-text{height: 2.5em} - -#content #data-search .field-category{width: 10% !important;} +#content #data-search .account-label .field-customer .field-text{height: 2.5em; width: 95%;} +#content #data-search .account-label .field-category{width: 10% !important;} #content #data-search .account-info{ float: left; @@ -51,4 +50,4 @@ } #content #data-search .account-actions img{margin:3px 5px;} #content .actions-optional{display: none;} -#content #data-search .account-spacer{width: 100%; height: 8em;} \ No newline at end of file +#content #data-search .account-spacer{float: left; clear: left; height: 2em; width: 20%} \ No newline at end of file diff --git a/css/styles.css b/css/styles.css index 071ec515..f1f915c6 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,6 +1,6 @@ *{font-family: Verdana, Tahoma, sans-serif;} -HTML, BODY{ +html, body{ margin: 0; padding: 0; text-align: left; @@ -10,7 +10,7 @@ HTML, BODY{ font-weight: normal; } -TABLE { +table { font-size: 11px; border-spacing: 0; } @@ -22,19 +22,19 @@ TABLE { vertical-align: middle; } -TABLE TH { border-bottom: 2px solid transparent; vertical-align: middle;} -TABLE TH .icon{ width: 24px; height: 24px;} -TABLE TR.odd {background-color:#f9f9f9;} -TABLE TR.even>TD, TABLE TR.odd>TD { border-bottom:1px solid #d9d9d9 !important; } -TABLE TR.even:hover{ background-color:#E8FF99; } -TABLE TR.odd:hover{ background-color:#E8FF99; } -TABLE TR { height:20px; } -TABLE TD { padding:3px; } -TABLE TD.txtCliente { font-weight:bold;text-align:center; } +table th { border-bottom: 2px solid transparent; vertical-align: middle;} +table th .icon{ width: 24px; height: 24px;} +table tr.odd {background-color:#f9f9f9;} +table tr.even>td, table tr.odd>td { border-bottom:1px solid #d9d9d9 !important; } +table tr.even:hover{ background-color:#E8FF99; } +table tr.odd:hover{ background-color:#E8FF99; } +table tr { height:20px; } +table td { padding:3px; } +table td.txtCliente { font-weight:bold;text-align:center; } -FORM { font-size: 11px; border: 0px solid #5dd; margin: 0; } +form { font-size: 11px; border: 0px solid #5dd; margin: 0; } -INPUT, SELECT, TEXTAREA { +input, select, textarea { background-color: #fffef0; color:black; font-size: 11px; @@ -46,25 +46,25 @@ INPUT, SELECT, TEXTAREA { padding:5px; } -INPUT:hover, SELECT:hover, TEXTAREA:hover{ +input:hover, select:hover, textarea:hover{ background-color: #fffccd; } -INPUT:active, SELECT:hover, TEXTAREA:active{ +input:active, select:hover, textarea:active{ background-color: #fffde1; color: #045FB4; border: 1px solid #5897fb; box-shadow: 0 0 5px rgba(0, 0, 0, 0.1) inset, 0 0 5px rgba(88, 151, 251, 0.5); } -INPUT:focus, SELECT:hover, TEXTAREA:focus{ +input:focus, select:hover, textarea:focus{ background-color: #fffccd; color: #045FB4; border: 1px solid #5897fb; box-shadow: 0 0 5px rgba(0, 0, 0, 0.1) inset, 0 0 5px rgba(88, 151, 251, 0.5); } -INPUT {width: 200px;} +input {width: 200px;} -INPUT.inputImg, IMG.inputImg { +input.inputImg, img.inputImg { background-color: transparent !important; width: 24px !important; height: 24px !important; @@ -73,18 +73,18 @@ INPUT.inputImg, IMG.inputImg { margin: 0 0.5em; } -INPUT.txtFile{width:200px;} -INPUT.txtLong{width:300px;} +input.txtFile{width:200px;} +input.txtLong{width:300px;} -TEXTAREA {width: 350px; resize: none;} +textarea {width: 350px; resize: none;} -SELECT.files {width: 250px;} -INPUT#rpp {width: 40px;} +select.files {width: 250px;} +input#rpp {width: 40px;} -IMG { margin:0; padding: 0; border: 0; cursor: pointer; } +img { margin:0; padding: 0; border: 0; cursor: pointer; } -IMG.inputImgMini { +img.inputImgMini { background-color: transparent !important; width: 16px !important; height: 16px !important; @@ -104,11 +104,11 @@ IMG.inputImgMini { .altTxtRed { color: darkred; } .altTxtBlue { color: #333399; font-weight: bold; } -A{text-decoration: none; color: #339;} -A:visited {text-decoration: none; color: #339;} -A:hover {text-decoration: none; color: orangered; cursor: pointer;} -A:active {text-decoration: none; color: #BB0000;} -A:focus {text-decoration: none; color: #FF0000;} +a{text-decoration: none; color: #339;} +a:visited {text-decoration: none; color: #339;} +a:hover {text-decoration: none; color: orangered; cursor: pointer;} +a:active {text-decoration: none; color: #BB0000;} +a:focus {text-decoration: none; color: #FF0000;} #nojs { width: 80%; @@ -158,7 +158,7 @@ A:focus {text-decoration: none; color: #FF0000;} text-align: right; } -#container #session IMG{ +#container #session img{ width: 24px; height: 24px; margin-left: 10px; @@ -183,13 +183,13 @@ A:focus {text-decoration: none; color: #FF0000;} text-align: center; } -#container #actionsBar UL{ +#container #actionsBar ul{ list-style: none; margin: 0; padding: 0; } -#container #actionsBar LI{ +#container #actionsBar li{ padding: 5px 10px; width: 100%; height: 50px; @@ -204,12 +204,12 @@ A:focus {text-decoration: none; color: #FF0000;} -moz-box-shadow: 5px 8px 6px -6px #a9a9a9; } -#container #actionsBar LI:hover{ +#container #actionsBar li:hover{ border: 1px solid #5897fb; box-shadow: 0 0 5px rgba(88, 151, 251, 0.5); } -#container #actionsBar LI IMG{ +#container #actionsBar li img{ width: 32px; height: 32px; position: relative; @@ -224,7 +224,7 @@ A:focus {text-decoration: none; color: #FF0000;} margin-bottom: 80px; } -#content TD.descField, #fancyContainer TD.descField{ +#content td.descField, #fancyContainer td.descField{ text-align:right; padding-right:20px; width: 25%; @@ -233,12 +233,12 @@ A:focus {text-decoration: none; color: #FF0000;} color: #555; } -#content TD.valField, #fancyContainer TD.valField { padding-left:20px; width: 100%;} +#content td.valField, #fancyContainer td.valField { padding-left:20px; width: 100%;} #content #tblTools{min-width: 875px; height: 5em; padding: 5px; padding-left: 15px;} #content #resBuscar{ min-width: 875px; min-height: 450px; margin-bottom: 50px;} -#content #resBuscar IMG {vertical-align:middle;} +#content #resBuscar img {vertical-align:middle;} #content #pageNav { float: left; @@ -254,11 +254,11 @@ A:focus {text-decoration: none; color: #FF0000;} background-color: #f5f5f5; } -#content #pageNav IMG { margin-left: 5px; vertical-align: middle;} -#content #pageNav A { margin-left: 5px; font-size: 12px; color: #999; } +#content #pageNav img { margin-left: 5px; vertical-align: middle;} +#content #pageNav a { margin-left: 5px; font-size: 12px; color: #999; } #content #pageNav .current {margin-left: 5px; color: darkorange; } -#content #pageNav>DIV {float: left; width: 50%; height: 1.5em; line-height: 1.5em} +#content #pageNav>div {float: left; width: 50%; height: 1.5em; line-height: 1.5em} #content #pageNav #pageNavLeft {text-align: left;} #content #pageNav #pageNavRight {text-align: right;} @@ -297,8 +297,8 @@ A:focus {text-decoration: none; color: #FF0000;} background-color: #f9f9f9; } -#content .data TD{text-align: left;} -#content .data TD.descField {text-align:right; font-size:12px; font-weight:bold; color: #999} +#content .data td{text-align: left;} +#content .data td.descField {text-align:right; font-size:12px; font-weight:bold; color: #999} #content .data select {min-width: 210px;} #content .data #files-wrap {max-height: 100px; width: 400px; overflow-y: auto; border: 1px solid #DFDFDF; padding: 0.5em;} @@ -340,12 +340,12 @@ A:focus {text-decoration: none; color: #FF0000;} #content .tblIcon {background: url("../imgs/clock.png") no-repeat 98% 5% #f9f9f9;} -#content #tabs FIELDSET{ border: 1px solid #c9c9c9;} -#content #tabs #frmConfig LABEL{ float: left;} +#content #tabs fieldset{ border: 1px solid #c9c9c9;} +#content #tabs #frmConfig label{ float: left;} #content .tblConfig {margin-bottom: 2em;} -#content .tblConfig TD.descField{width:35%; font-size:11px; font-weight:bold;} -#content .tblConfig TD.rowHeader{ +#content .tblConfig td.descField{width:35%; font-size:11px; font-weight:bold;} +#content .tblConfig td.rowHeader{ padding: 5px 0 5px 0; background-color:#f5f5f5; text-align: center; @@ -355,12 +355,12 @@ A:focus {text-decoration: none; color: #FF0000;} letter-spacing: 0.5em; color: #696969; } -#content .tblConfig INPUT.checkbox{width: 15px;text-align: left;padding:0;} +#content .tblConfig input.checkbox{width: 15px;text-align: left;padding:0;} #content .tblConfig .option-disabled{text-align: center;background-color: #FFF2D9; color: orange;font-weight: bold;} #content #tblAccion {width: 100%;} -#content H2{ +#content h2{ width: 100%; height: 1.5em; font-size: 18px; @@ -379,8 +379,8 @@ A:focus {text-decoration: none; color: #FF0000;} color: #045FB4; } -#content .row_even>TD{background-color: #f5f5f5;} -#content .row_odd>TD{background-color: white;} +#content .row_even>td{background-color: #f5f5f5;} +#content .row_odd>td{background-color: white;} #content .data-header ul{ display: table; @@ -440,7 +440,7 @@ A:focus {text-decoration: none; color: #FF0000;} #content #data-search {text-align: center;} #content #data-search .account-label{ width: 310px; - height: 205px; + height: 195px; text-align: left; margin: 1em; padding: 0.5em; @@ -449,19 +449,23 @@ A:focus {text-decoration: none; color: #FF0000;} display: inline-block; } #content #data-search .account-label .label-field{width: 100%;height: 2em;} -#content #data-search .account-label .field-name{float: left; width: 80px; padding: 0.3em 0.2em; color: #b9b9b9;} -#content #data-search .account-label .field-text{float: left; width: 215px; padding: 0.3em 0.3em;} +#content #data-search .account-label .field-name{float: left; width: 80px; padding: 0.4em 0.2em; color: #b9b9b9;} +#content #data-search .account-label .field-text{float: left; width: 215px; padding: 0.4em 0.2em;} #content #data-search .account-label .header .field-name{color: white; font-weight: bold} +#content #data-search .account-label .field-customer .field-name{display: none} +#content #data-search .account-label .field-customer .field-text{width: 304px;} +#content #data-search .account-label .field-url {height: 2.5em;} + #content #data-search .account-label .field-text a{color: #4895FA} #content #data-search .account-label .no-link a{color: white; font-weight: bold;} #content #data-search .account-info{ width: 100%; height: 2em; - padding: 1em 0; + padding: .5em 0; text-align: left; - border-top: 1px solid #d9d9d9; + /*border-top: 1px solid #d9d9d9;*/ } #content #data-search .account-actions{ @@ -469,28 +473,26 @@ A:focus {text-decoration: none; color: #FF0000;} height: 2.5em; padding-top: 5px; text-align: right; - /*border-top: 1px solid #c9c9c9;*/ background-color: #f5f5f5; box-shadow: 0 0 8px rgba(0, 0, 0, 0.075) inset; } #content .actions-optional{display: none;} -#content #data-search .account-spacer{width: 100%; height: 8em;} +#content #data-search .account-spacer{width: 100%; height: 7.5em;} #content .rowSpace>.cellBorder{height: 10px;border-top:1px solid #d9d9d9;} #content .rowSpace>.cellBlank{height: 10px;} #content #resEventLog .data {width: 100%;} #content #resEventLog thead {text-align: center} -#content #resEventLog TBODY {width: 100%; height: 500px; overflow: auto; } -#content #resEventLog TD{border-bottom: 1px solid #d9d9d9;} +#content #resEventLog tbody {width: 100%; height: 500px; overflow: auto; } +#content #resEventLog td{border-bottom: 1px solid #d9d9d9;} #content #resEventLog .cell{text-align: center;} #content #resEventLog .cell-description{width: 60%;} #content #tblTools div.chosen-container{margin: 0 5px;} #content #tblTools #txtSearch, #content #tblTools select {min-width: 180px;} -#content #tblTools LABEL{margin-left:15px; color: #999;} -/*#content #tblTools IMG{margin-left:0.5em;}*/ +#content #tblTools label{margin-left:15px; color: #999;} #content #tblTools #toolsLeft{text-align: left; width: 80%;} #content #tblTools #toolsRight{text-align: right; width: 5%;} #content #tblTools #toolsRight input{margin-left: 15px; text-align: center;} @@ -499,14 +501,14 @@ A:focus {text-decoration: none; color: #FF0000;} #content #tblTools #btnClear:hover{opacity: 1;filter:alpha(opacity=100);} #content #tblTools #order {margin-top: 0.5em; padding: 0.3em;color:#696969;} -#content #tabs>DIV{min-height: 475px;} +#content #tabs>div{min-height: 475px;} #content #tabs.ui-widget-content {border: none; background-color: transparent;} #content #tabs .ui-widget-header {background: none; border: none; border-bottom: 1px solid #c9c9c9;} #content #tabs.ui-widget-content{background: none !important;} #content #tabs .tabs-spacer { float: left; height: 200px; } #content .tabs-bottom .ui-tabs-nav { clear: left; padding: 0 .2em .2em .2em; } -#content .tabs-bottom .ui-tabs-nav LI { top: auto; bottom: 0; margin: 0 .2em 1px 0; border-bottom: auto; border-top: 0; } -#content .tabs-bottom .ui-tabs-nav LI.ui-tabs-active { margin-top: -1px; padding-top: 1px; } +#content .tabs-bottom .ui-tabs-nav li { top: auto; bottom: 0; margin: 0 .2em 1px 0; border-bottom: auto; border-top: 0; } +#content .tabs-bottom .ui-tabs-nav li.ui-tabs-active { margin-top: -1px; padding-top: 1px; } #datos{ float:left; @@ -557,8 +559,8 @@ A:focus {text-decoration: none; color: #FF0000;} #fancyView.backGrey{background-color: #f2f2f2 !important;} #fancyView PRE{text-align: left;} -#fancyView TABLE{border: none; width: 100%;font-size: 14px;text-align: left;} -#fancyView TD{border-bottom: #d9d9d9 1px solid;} +#fancyView table{border: none; width: 100%;font-size: 14px;text-align: left;} +#fancyView td{border-bottom: #d9d9d9 1px solid;} #fancyMsg { min-width: 250px; @@ -578,8 +580,8 @@ A:focus {text-decoration: none; color: #FF0000;} -webkit-border-radius: 25px; } -#fancyMsg TABLE{ border: none; width: 100%;font-size: 14px;text-align: left;} -#fancyMsg TD{border-bottom: #d9d9d9 1px solid;} +#fancyMsg table{ border: none; width: 100%;font-size: 14px;text-align: left;} +#fancyMsg td{border-bottom: #d9d9d9 1px solid;} #fancyMsg.msgError { background: url('../imgs/bg_msg_error.png') white repeat-x; color: #CC0000;} #fancyMsg.msgOk { background: url('../imgs/bg_msg_ok.png') white repeat-x; color: green;} @@ -590,7 +592,7 @@ A:focus {text-decoration: none; color: #FF0000;} #fancyContainer {padding: 0 15px 15px 15px;} -#fancyContainer H2 { +#fancyContainer h2 { width: 80%; height: 1.5em; font-size: 18px; @@ -748,7 +750,7 @@ footer img{border: none;width: 16px;height: 16px;vertical-align: middle;} /* COMBO */ .custom-combobox { position: relative; display: inline-block;} -.custom-combobox INPUT { width: 80%;} +.custom-combobox input { width: 80%;} .custom-combobox-toggle { position: absolute; diff --git a/inc/tpl/eventlog.php b/inc/tpl/eventlog.php index 90269494..00298243 100644 --- a/inc/tpl/eventlog.php +++ b/inc/tpl/eventlog.php @@ -90,7 +90,7 @@ $numRows = SP_Log::$numRows; log_login); ?> - log_ipAddress; ?> + log_ipAddress) : $log->log_ipAddress; ?>