diff options
Diffstat (limited to 'app/views/admin_general')
| -rw-r--r-- | app/views/admin_general/_admin_navbar.rhtml | 20 | ||||
| -rw-r--r-- | app/views/admin_general/index.rhtml | 21 | ||||
| -rw-r--r-- | app/views/admin_general/stats.rhtml | 6 | ||||
| -rw-r--r-- | app/views/admin_general/timeline.rhtml | 10 |
4 files changed, 29 insertions, 28 deletions
diff --git a/app/views/admin_general/_admin_navbar.rhtml b/app/views/admin_general/_admin_navbar.rhtml index 408c45588..49592c545 100644 --- a/app/views/admin_general/_admin_navbar.rhtml +++ b/app/views/admin_general/_admin_navbar.rhtml @@ -2,17 +2,17 @@ <div class="navbar navbar-fixed-top navbar-inverse"> <div class="navbar-inner"> <div class="container"> - <%= link_to 'Alaveteli', main_url('/'), :class => "brand" %> + <%= link_to 'Alaveteli', frontpage_path, :class => "brand" %> <div class="nav-collapse"> <ul class="nav"> - <li><%= link_to 'Summary', admin_url("") %></li> - <li><%= link_to 'Timeline', admin_url("timeline") %></li> - <li><%= link_to 'Stats', admin_url("stats") %></li> - <li><%= link_to 'Debug', admin_url("debug") %></li> - <li><%= link_to 'Authorities', admin_url("body/list") %></li> - <li><%= link_to 'Requests', admin_url("request/list") %></li> - <li><%= link_to 'Users', admin_url("user/list") %></li> - <li><%= link_to 'Tracks', admin_url("track/list") %></li> + <li><%= link_to 'Summary', admin_general_index_path %></li> + <li><%= link_to 'Timeline', admin_timeline_path %></li> + <li><%= link_to 'Stats', admin_stats_path %></li> + <li><%= link_to 'Debug', admin_debug_path %></li> + <li><%= link_to 'Authorities', admin_body_list_path %></li> + <li><%= link_to 'Requests', admin_request_list_path %></li> + <li><%= link_to 'Users', admin_user_list_path %></li> + <li><%= link_to 'Tracks', admin_track_list_path %></li> <li><%= link_to 'Log out', signout_path %></li> </ul> </div> @@ -20,3 +20,5 @@ </div> </div> </div> + + diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index 68b434ad9..7ff8ae895 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -16,7 +16,6 @@ </div> </div> -<hr> <div class="row"> <div class="span12"> @@ -64,8 +63,8 @@ <% for @request in @error_message_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, request_admin_url(@request))%> - <%= link_to(@request.title, main_url(request_url(@request))) %> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%> + <%= link_to(@request.title, request_path(@request)) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -90,8 +89,8 @@ <% for @request in @attention_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, request_admin_url(@request))%> - <%= link_to(@request.title, main_url(request_url(@request))) %> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%> + <%= link_to(@request.title, request_path(@request)) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -115,8 +114,8 @@ <% for @request in @requires_admin_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, request_admin_url(@request))%> - <%= link_to(@request.title, main_url(request_url(@request))) %> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%> + <%= link_to(@request.title, request_path(@request)) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -140,8 +139,8 @@ <% for @blank_contact in @blank_contacts %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, public_body_admin_url(@blank_contact))%> - <%= link_to h(@blank_contact.name), main_url(public_body_url(@blank_contact)) %> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_body_show_path(@blank_contact))%> + <%= link_to h(@blank_contact.name), public_body_url(@blank_contact) %> </td> <td class="span2"> <%=simple_date(@blank_contact.updated_at)%> @@ -165,8 +164,8 @@ <% for @request in @old_unclassified %> <tr> <td class="link"> - <%= link_to("<i class='icon-tags'></i>".html_safe, request_admin_url(@request)) %> - <%= link_to(@request.title, main_url(request_link(@request))) %> + <%= link_to("<i class='icon-tags'></i>".html_safe, admin_request_show_url(@request)) %> + <%= link_to(@request.title, request_link(@request)) %> </td> <td class="span2"> <%=simple_date(@request.get_last_response_event.created_at)%> diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml index b17c8bb2f..f9163b332 100644 --- a/app/views/admin_general/stats.rhtml +++ b/app/views/admin_general/stats.rhtml @@ -1,4 +1,5 @@ <% @title = "Statistics" %> + <div class="hero-unit"> <h2><%=@public_body_count%> public authorities</h2> <h2><%=@info_request_count%> requests, <%=@outgoing_message_count%> outgoing messages, <%=@incoming_message_count%> incoming messages</h2> @@ -10,7 +11,7 @@ <div class="span12"> <h1>Statistics</h1> <h2>Chart of requests (excluding backpaged)</h2> - <img src="<%= main_url("/foi-live-creation.png")%>"> + <img src="/foi-live-creation.png"> </div> </div> <div class="row"> @@ -33,7 +34,7 @@ <div class="row"> <div class="span12"> <h2>Chart of users</h2> - <img src="<%= main_url("/foi-user-use.png")%>"> + <img src="/foi-user-use.png"> </div> </div> <div class="row"> @@ -58,4 +59,3 @@ <h2>Web analytics</h2> </div> </div> - diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml index 743296749..ec5b860e5 100644 --- a/app/views/admin_general/timeline.rhtml +++ b/app/views/admin_general/timeline.rhtml @@ -31,8 +31,8 @@ <%= simple_time(event_at) %> <% if event.is_a? InfoRequestEvent %> - <%= link_to('<i class="icon-tags"></i>'.html_safe, request_admin_url(event.info_request), :title => "view full details")%> - <%= link_to(event.info_request.title, main_url(request_url(event.info_request)), :title => "view request on public website")%> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(event.info_request), :title => "view full details")%> + <%= link_to(event.info_request.title, request_path(event.info_request), :title => "view request on public website")%> <% if event.event_type == 'edit' %> was edited by administrator <strong><%=h event.params[:editor] %></strong>. @@ -79,7 +79,7 @@ <% elsif event.event_type == 'response' %> <% incoming_message = event.incoming_message %> received - <%= link_to 'a response', main_url(incoming_message_url(incoming_message)) %> + <%= link_to 'a response', incoming_message_path(incoming_message) %> from <%=h event.info_request.public_body.name %>. <% elsif event.event_type == 'sent' %> was initially sent to <%=h event.params[:email]%> at <%=h event.info_request.public_body.name %>. @@ -95,8 +95,8 @@ had '<%=event.event_type%>' done to it, parameters <%=h event.params_yaml%>. <% end %> <% else %> - <%= link_to('<i class="icon-tags"></i>'.html_safe, public_body_admin_url(event.public_body), :title => "view full details")%> - <%= link_to(event.public_body.name, main_url(public_body_url(event.public_body)), :title => "view authority on public website")%> + <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_body_show_path(event.public_body), :title => "view full details")%> + <%= link_to(event.public_body.name, public_body_path(event.public_body), :title => "view authority on public website")%> was created/updated by administrator <strong><%=h event.last_edit_editor %></strong> <% end %> <% end %> |