diff options
| -rw-r--r-- | templates/web/zurich/admin/header.html | 30 | ||||
| -rw-r--r-- | templates/web/zurich/admin/reports.html | 4 | ||||
| -rw-r--r-- | web/cobrands/zurich/_zurich.scss | 118 |
3 files changed, 107 insertions, 45 deletions
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 113839a65..7e2337e6d 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -18,11 +18,29 @@ 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>--> + <div class="admin-nav"> + <ul> + [% pagename = c.req.uri.path %] + [% pagename = pagename.replace('/admin/?(\w*)', '$1') %] + + <li [% IF pagename == 'summary' OR pagename == '' %]class="current"[% END %]> + <a href="/admin/summary">[% loc('Summary') %]</a> + </li> + [% IF admin_type == 'dm' OR admin_type == 'super' %] + <li [% IF pagename == 'bodies' %]class="current"[% END %]> + <a href="/admin/bodies">[% loc('Bodies') %]</a> + </li> + <li [% IF pagename == 'reports' %]class="current"[% END %]> + <a href="/admin/reports">[% loc('Reports') %]</a> + </li> + <li class="search-box"> + <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> + <input type="text" name="search" size="20" id="search" placeholder="[% loc('Search reports') %]"> + </form> + </li> + </ul> + </div> <!-- | <a href="timeline">Timeline</a> --> <!-- | <a href="questionnaire">Survey</a> --> <!-- | <a href="/admin/users">[% loc('Users') %]</a> --> @@ -30,4 +48,4 @@ select { width: auto; } <!-- | <a href="stats">Stats</a> --> [% END %] - <h1>[% title %]</h1> + <h1 style="clear:both;">[% title %]</h1> diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html index 5911934c8..0a3b5d568 100644 --- a/templates/web/zurich/admin/reports.html +++ b/templates/web/zurich/admin/reports.html @@ -1,10 +1,6 @@ [% PROCESS 'admin/header.html' title=loc('Search Reports') %] [% PROCESS 'admin/report_blocks.html' %] -<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search"> -</form> - [% IF searched %] <table cellspacing="0" cellpadding="2" border="1"> <tr> diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index a0c26a1cf..0f3f52303 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -31,42 +31,90 @@ 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 { + .admin-nav { + background: #f4f4f4; + @include background(linear-gradient(#fbfbfb, #efefef)); border-bottom: 2px solid $table_border_color; + margin: 0 0 1em 0; + ul { + overflow:auto; + margin:0 0 -2px 0; + list-style: none; + padding: 0; + border-top: 1px solid $table_border_color; + border-left: 1px solid $table_border_color; + border-right: 1px solid $table_border_color; + li { + border-right: 1px solid $table_border_color; + float:left; + list-style: none; + margin:0; + padding: 0.5em 1em; + font-weight: bold; + color: #000; + a { + color: #000; + } + } + li.search-box { + float: right; + } + li.current { + background-color: #fff; + border-bottom: 2px solid #fff; + } + li.search-box { + border:none; + padding: 0.2em 0.5em 0.2em 30px; + background-image: url('search-icon.png'); + background-position: 2px center; + background-repeat: no-repeat; + input { + height: 100%; + width: 12em; + border: none; + padding: 6px 0.5em; + } + } + } } - 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 |