diff options
| -rw-r--r-- | templates/web/zurich/admin/header.html | 24 | ||||
| -rw-r--r-- | web/cobrands/zurich/_zurich.scss | 97 |
2 files changed, 80 insertions, 41 deletions
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 113839a65..cc24b7394 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -18,11 +18,23 @@ dd { margin-left: 8em; } select { width: auto; } </style> - <p><strong>[% loc('FixMyStreet admin:') %]</strong> - <a href="/admin/summary">[% loc('Summary') %]</a> -[% IF admin_type == 'dm' OR admin_type == 'super' %] - | <a href="/admin/bodies">[% loc('Bodies') %]</a> - | <a href="/admin/reports">[% loc('Reports') %]</a> + <!--<strong>[% loc('FixMyStreet admin:') %]</strong>--> + <ul class="admin-nav"> + <li> + <a href="/admin/summary">[% loc('Summary') %]</a> + </li> + [% IF admin_type == 'dm' OR admin_type == 'super' %] + <li> + <a href="/admin/bodies">[% loc('Bodies') %]</a> + </li> + <li> + <a href="/admin/reports">[% loc('Reports') %]</a> + </li> + <li class="search-box"> + Search + </li> + + </ul> <!-- | <a href="timeline">Timeline</a> --> <!-- | <a href="questionnaire">Survey</a> --> <!-- | <a href="/admin/users">[% loc('Users') %]</a> --> @@ -30,4 +42,4 @@ select { width: auto; } <!-- | <a href="stats">Stats</a> --> [% END %] - <h1>[% title %]</h1> + <h1 style="clear:both;">[% title %]</h1> diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index a0c26a1cf..b1875e86d 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -31,42 +31,69 @@ a:hover { color: #3c3c3c; } -.admin table { - width: 100%; - font-size: 0.9em; - border: 1px solid $table_border_color; - border-collapse:collapse; - th, td { - padding: 0.666em 0.5em; - border: 1px solid $table_border_color; - } - th { - color: white; - background-color: $table_heading_bg_col; - border-bottom: 2px solid $table_heading_underline_col; - border-left: 1px solid $table_heading_border_col; - border-right: 1px solid $table_heading_border_col; - - } - td.record-id { - text-align: center; - font-weight: bold; - } - tr.filter-row td { - display: none; /* TODO: reveal when filtering is implemented */ - padding: 4px 4px 4px 40px; - background-color: $button_bg_col; - background-image: url('search-icon-white.png'); - background-position: 14px center; - background-repeat: no-repeat; +.admin { + ul.admin-nav { + overflow:auto; + background: #f4f4f4; + margin:0 0 1em 0; + list-style: none; + padding: 0; + border-top: 1px solid $table_border_color; + border-left: 1px solid $table_border_color; border-bottom: 2px solid $table_border_color; + li { + border-right: 1px solid $table_border_color; + display: inline; + float:left; + list-style: none; + margin:0; + padding: 0.5em 1em; + font-weight: bold; + color: #000; + a { + color: #000; + } + } + li.search-box { + float: right; + } } - tr.filter-row td input[type=text] { - background-color: #e1e1e1; - width: 16em; - @include border-radius(4px); - border: none; - padding: 3px 0.5em; + table { + width: 100%; + font-size: 0.9em; + border: 1px solid $table_border_color; + border-collapse:collapse; + th, td { + padding: 0.666em 0.5em; + border: 1px solid $table_border_color; + } + th { + color: white; + background-color: $table_heading_bg_col; + border-bottom: 2px solid $table_heading_underline_col; + border-left: 1px solid $table_heading_border_col; + border-right: 1px solid $table_heading_border_col; + + } + td.record-id { + text-align: center; + font-weight: bold; + } + tr.filter-row td { + display: none; /* TODO: reveal when filtering is implemented */ + padding: 4px 4px 4px 40px; + background-color: $button_bg_col; + background-image: url('search-icon-white.png'); + background-position: 14px center; + background-repeat: no-repeat; + border-bottom: 2px solid $table_border_color; + } + tr.filter-row td input[type=text] { + background-color: #e1e1e1; + width: 16em; + @include border-radius(4px); + border: none; + padding: 3px 0.5em; + } } - }
\ No newline at end of file |