From 04424f9762b0aa060b4caf7dd335fd1761c80aa0 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Fri, 21 Sep 2012 11:05:10 +0000 Subject: [PATCH] - Small fixes to the custom display of lists. - CSS improvement for dashboards SVN:trunk[2196] --- application/datatable.class.inc.php | 38 ++++++++++++++++------------ css/light-grey.css | 31 ++++++++++++++++++++--- images/toolkit_menu.png | Bin 3716 -> 779 bytes js/jquery.tablesorter.pager.js | 2 +- 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/application/datatable.class.inc.php b/application/datatable.class.inc.php index 9cb7440d4..ba943ed92 100644 --- a/application/datatable.class.inc.php +++ b/application/datatable.class.inc.php @@ -91,10 +91,14 @@ class DataTable $sDataTable = $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams); $sConfigDlg = $this->GetTableConfigDlg($oPage, $aColumns, $bViewLink, $iDefaultPageSize); - $sHtml = "iListId}\" class=\"datatable\">\n"; - $sHtml .= "\n"; - $sHtml .= "\n"; - $sHtml .= "\n"; + $sHtml = "
$sObjectsCount$sActionsMenu
$sPager$sToolkitMenu
$sDataTable
iListId}\" class=\"datatable\">"; + $sHtml .= ""; + $sHtml .= ""; $sHtml .= "
"; + $sHtml .= ""; + $sHtml .= ""; + $sHtml .= "$sPager"; + $sHtml .= "
$sObjectsCount$sToolkitMenu $sActionsMenu
"; + $sHtml .= "
$sDataTable
\n"; $oPage->add_at_the_end($sConfigDlg); @@ -146,11 +150,11 @@ class DataTable { if (($sSelectMode == 'single') || ($sSelectMode == 'multiple')) { - $sHtml = Dict::Format('UI:Pagination:HeaderSelection', ''.$this->iNbObjects.'', '0'); + $sHtml = '
'.Dict::Format('UI:Pagination:HeaderSelection', ''.$this->iNbObjects.'', '0').'
'; } else { - $sHtml = Dict::Format('UI:Pagination:HeaderNoSelection', ''.$this->iNbObjects.''); + $sHtml = '
'.Dict::Format('UI:Pagination:HeaderNoSelection', ''.$this->iNbObjects.'').'
'; } return $sHtml; } @@ -210,19 +214,20 @@ class DataTable $sSelectionMode = ($iNbPages == 1) ? '' : 'positive'; $sHtml = << -

+ EOF; return $sHtml; } @@ -238,7 +243,7 @@ EOF; protected function GetToolkitMenu(WebPage $oPage, $aExtraParams) { $sMenuTitle = Dict::S('UI:ConfigureThisList'); - $sHtml = ''; + $sHtml = ''; //$oPage->add_ready_script("$('#tk_{$this->iListId} > ul').popupmenu();"); return $sHtml; } @@ -501,11 +506,11 @@ EOF $oPage->add_ready_script("$('#pager{$this->iListId}').html('".str_replace("\n", ' ', addslashes($sHtml))."');"); if ($iDefaultPageSize < 1) { - $oPage->add_ready_script("$('#pager{$this->iListId}').hide()"); + $oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()"); } else { - $oPage->add_ready_script("$('#pager{$this->iListId}').show()"); + $oPage->add_ready_script("$('#pager{$this->iListId}').parent().show()"); } } } @@ -735,7 +740,8 @@ class DataTableSettings implements Serializable { // Turn the key into a suitable PCRE pattern $sKey = $this->GetPrefsKey(null); - $sPattern = '!^'.str_replace(array('*'), array('.*'), $sKey).'$!'; + $sPattern = str_replace(array('|'), array('\\|'), $sKey); // escape the | character + $sPattern = '#^'.str_replace(array('*'), array('.*'), $sPattern).'$#'; // Don't use slash as the delimiter since it's used in our key to delimit aliases appUserPreferences::UnsetPref($sPattern, true); } else diff --git a/css/light-grey.css b/css/light-grey.css index fc46bc73c..38e00e3b2 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -400,6 +400,10 @@ a.CollapsibleLabel.open, td a.CollapsibleLabel.open { background-color:#f6f6f1; padding:5px; } +/* move up a header immediately following a display block (i.e. "actions" menu) */ +.display_block + .page_header { + margin-top: -8px; +} .notreeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; } .notreeview .collapsable { background-image: url(../images/tv-collapsable.gif); } @@ -432,6 +436,7 @@ div.actions_menu > ul { padding-left: 5px; background: url(../images/actions_left.png) no-repeat top left; cursor: pointer; + margin: 0; } div.actions_menu > ul > li { @@ -446,12 +451,14 @@ div.actions_menu > ul > li { font-weight: bold; color: #fff; vertical-align: middle; + margin: 0; } #logOffBtn > ul > li { list-style: none; vertical-align: middle; margin: 0; padding: 0; + cursor: pointer; } #logOffBtn > ul { list-style: none; @@ -482,6 +489,14 @@ div.actions_menu > ul > li { white-space: nowrap; background: #fff; } +.itop_popup ul { + padding-left: 0; +} + +.menucontainer div.toolkit_menu { + margin-left: 10px; +} + .itop_popup li a:hover, #logOffBtn li a:hover { background: #1A4473; } @@ -516,6 +531,9 @@ div.actions_menu > ul > li { color: #fff; font-weight: bold; } +.itop_popup > ul { + margin: 0; +} hr.menu-separator { border: none 0; border-top: 1px solid #ccc;; @@ -1081,8 +1099,11 @@ table.pagination { table.pagination tr td { padding: 3px; } +.pagination_container { + padding-left: 3px; +} .pager { - float:left; + display:inline-block; } .pager p { margin-top: 0; @@ -1111,7 +1132,7 @@ div.actions_button { float:right; background: url("../images/actions_left.png") no-repeat scroll left top transparent; padding-left: 5px; - margin-top: 13px; + margin-top: 0; margin-right: 10px; height:17px; vertical-align: middle; @@ -1227,7 +1248,7 @@ td.prop_icon { } .main_header { background-color: #F1F1F6; - height: 60px; + min-height: 60px; width: 100%; } .main_header h1 { @@ -1243,10 +1264,11 @@ td.prop_icon { margin-right: 10px; float:left; } -a.summary { +a.summary, a.summary:hover { background: none repeat scroll 0 0 transparent; color: #666666; text-decoration: none; + padding-left: 0; } .summary-details td { background: none repeat scroll 0 0 transparent; @@ -1259,6 +1281,7 @@ a.summary { vertical-align: middle; margin: 0; padding: 0; + cursor: pointer; } #DashboardMenu > ul { diff --git a/images/toolkit_menu.png b/images/toolkit_menu.png index 5611cd3a5c28e07e415c386fe3c6da9d3d58def8..636393795e251216240c0f43714f55ce2da13d01 100644 GIT binary patch delta 763 zcmVe+d*06e%6SwtfHr0*gsRK~zY`#g<)2 zQ(+j#e>)ASkSxOC#A%4u#0G>h0jRGZ2 zkVqsd1dE~Ag&)hgyvl~U>`OzaY@N4@=5(9;>c#_q4$tBDzVDysdESSkxR<2^5G>Pk zf8za+Li#0S;S(~EB;{;Cz1>7K#wTP{+qNJjua3!u>Q2^XAxZu;ETyE}Y<5{{D0$dO z#*TuB+)nEiN?Yu#&(DjU%nyx zVw?H{DCHQ?ShoYopMhd?H2`jVa~M}xZ$SX>+Mlww#ZLQyV~qE{iJb`qN?C|FKyck} z3NkWkZ$^8tEQl+rw@_4XVWjN|o}RwAOQKBVZVrbSDfGV=KQGSJ;A(A8s3(+(e>PI6 z5rD3XwK$tv|7%VNKG6oW@vrDiC{m`j~LOWvPA6dPc&&-O%KPm0C)~fU&9~ z%z(yZ;Bd!d%32@9JTNq#FNYNGP%&0jP;jO)u(;RONSFCqAkH)yIMmrjYRJH9@E_cu zi9E<8*`Ja~Ql_jyfBZ<00f*Jbf2+D%d~~__u;><~>GCmDo@Cvo+@L+KYx1I=5wjd> zy)LK;9abBTo3{h;qw=G8ox=+gv}8BQX{xwOECG@%1kp4(;0!EyX}-#9t1XOqe*O~f zj%NT&^baxXog&u0^YRH9MO}tg$U@8kNs-*HT$_SguVZq+$w4Mp2udyR82cm&ZpHe*qGZvhrUrP~iXo002ovPDHLkV1lCoTdM#7 literal 3716 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
$sPages + + + - +
$sPages $sPagesLinks $sPageSizeCombo   +
- - - +