@@ -0,0 +1,8 | |||||
|
1 | <% unless controller_name == 'admin' && action_name == 'index' %> | |||
|
2 | <% content_for :sidebar do %> | |||
|
3 | <h3><%=l(:label_administration)%></h3> | |||
|
4 | <%= render :partial => 'admin/menu' %> | |||
|
5 | <% end %> | |||
|
6 | <% end %> | |||
|
7 | ||||
|
8 | <%= render :file => "layouts/base" %> |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class AdminController < ApplicationController |
|
18 | class AdminController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | helper :sort |
|
23 | helper :sort |
@@ -177,7 +177,7 class ApplicationController < ActionController::Base | |||||
177 |
|
177 | |||
178 | def render_403 |
|
178 | def render_403 | |
179 | @project = nil |
|
179 | @project = nil | |
180 |
render :template => "common/403", :layout => |
|
180 | render :template => "common/403", :layout => (request.xhr? ? false : 'base'), :status => 403 | |
181 | return false |
|
181 | return false | |
182 | end |
|
182 | end | |
183 |
|
183 |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class AuthSourcesController < ApplicationController |
|
18 | class AuthSourcesController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | def index |
|
23 | def index |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class CustomFieldsController < ApplicationController |
|
18 | class CustomFieldsController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | def index |
|
23 | def index |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class EnumerationsController < ApplicationController |
|
18 | class EnumerationsController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | helper :custom_fields |
|
23 | helper :custom_fields |
@@ -16,7 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class GroupsController < ApplicationController |
|
18 | class GroupsController < ApplicationController | |
19 |
layout ' |
|
19 | layout 'admin' | |
|
20 | ||||
20 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
21 |
|
22 | |||
22 | helper :custom_fields |
|
23 | helper :custom_fields |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class IssueStatusesController < ApplicationController |
|
18 | class IssueStatusesController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ], |
|
23 | verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ], |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class RolesController < ApplicationController |
|
18 | class RolesController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | verify :method => :post, :only => [ :destroy, :move ], |
|
23 | verify :method => :post, :only => [ :destroy, :move ], |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class SettingsController < ApplicationController |
|
18 | class SettingsController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | def index |
|
23 | def index |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class TrackersController < ApplicationController |
|
18 | class TrackersController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | def index |
|
23 | def index |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class UsersController < ApplicationController |
|
18 | class UsersController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin, :except => :show |
|
21 | before_filter :require_admin, :except => :show | |
20 |
|
22 | |||
21 | helper :sort |
|
23 | helper :sort | |
@@ -62,7 +64,8 class UsersController < ApplicationController | |||||
62 | if @user != User.current && !User.current.admin? && @memberships.empty? && events.empty? |
|
64 | if @user != User.current && !User.current.admin? && @memberships.empty? && events.empty? | |
63 | render_404 and return |
|
65 | render_404 and return | |
64 | end |
|
66 | end | |
65 |
|
67 | render :layout => 'base' | ||
|
68 | ||||
66 | rescue ActiveRecord::RecordNotFound |
|
69 | rescue ActiveRecord::RecordNotFound | |
67 | render_404 |
|
70 | render_404 | |
68 | end |
|
71 | end |
@@ -16,6 +16,8 | |||||
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class WorkflowsController < ApplicationController |
|
18 | class WorkflowsController < ApplicationController | |
|
19 | layout 'admin' | |||
|
20 | ||||
19 | before_filter :require_admin |
|
21 | before_filter :require_admin | |
20 |
|
22 | |||
21 | def index |
|
23 | def index |
@@ -1,25 +1,19 | |||||
1 | <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> |
|
1 | <div id="admin-menu"> | |
2 | <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuProjects');" onclick="this.blur(); return false;"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">▶</span></a> |
|
2 | <ul> | |
3 | <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuUsers');" onclick="this.blur(); return false;"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">▶</span></a> |
|
3 | <li><%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %></li> | |
4 |
|
|
4 | <li><%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %></li> | |
5 | <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuTrackers');" onclick="this.blur(); return false;"><span class="menuItemText"><%=l(:label_issue_tracking)%></span><span class="menuItemArrow">▶</span></a> |
|
5 | <li><%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %></li> | |
6 |
|
|
6 | <li><%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %></li> | |
7 |
|
|
7 | <li><%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %></li> | |
8 | <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %> |
|
8 | <li><%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %></li> | |
9 | <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %> |
|
9 | <li><%= link_to l(:label_workflow), {:controller => 'workflows', :action => 'edit'}, :class => 'workflows' %></li> | |
10 |
|
|
10 | <li><%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %></li> | |
11 |
|
|
11 | <li><%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %></li> | |
12 | </div> |
|
12 | <li><%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %></li> | |
13 | <div id="menuTrackers" class="menu"> |
|
13 | <% menu_items_for(:admin_menu) do |item| -%> | |
14 | <%= link_to l(:label_tracker_plural), {:controller => 'trackers' }, :class => "menuItem" %> |
|
14 | <li><%= link_to h(item.caption), item.url, item.html_options %></li> | |
15 | <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %> |
|
15 | <% end -%> | |
16 |
|
|
16 | <li><%= link_to l(:label_plugins), {:controller => 'admin', :action => 'plugins'}, :class => 'plugins' %></li> | |
17 | </div> |
|
17 | <li><%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info'}, :class => 'info' %></li> | |
18 | <div id="menuProjects" class="menu"> |
|
18 | </ul> | |
19 | <%= link_to l(:button_list), {:controller => 'admin', :action => 'projects' }, :class => "menuItem" %> |
|
|||
20 | <%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %> |
|
|||
21 | </div> |
|
|||
22 | <div id="menuUsers" class="menu"> |
|
|||
23 | <%= link_to l(:button_list), {:controller => 'users' }, :class => "menuItem" %> |
|
|||
24 | <%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %> |
|
|||
25 | </div> |
|
19 | </div> |
@@ -1,56 +1,8 | |||||
1 | <h2><%=l(:label_administration)%></h2> |
|
1 | <h2><%=l(:label_administration)%></h2> | |
2 |
|
2 | |||
3 | <%= render :partial => 'no_data' if @no_configuration_data %> |
|
3 | <div id="admin-index"> | |
4 |
|
4 | <%= render :partial => 'no_data' if @no_configuration_data %> | ||
5 | <p class="icon22 icon22-projects"> |
|
5 | <%= render :partial => 'menu' %> | |
6 | <%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> | |
|
6 | </div> | |
7 | <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %> |
|
|||
8 | </p> |
|
|||
9 |
|
||||
10 | <p class="icon22 icon22-users"> |
|
|||
11 | <%= link_to l(:label_user_plural), :controller => 'users' %> | |
|
|||
12 | <%= link_to l(:label_new), :controller => 'users', :action => 'add' %> |
|
|||
13 | </p> |
|
|||
14 |
|
||||
15 | <p class="icon22 icon22-groups"> |
|
|||
16 | <%= link_to l(:label_group_plural), :controller => 'groups' %> | |
|
|||
17 | <%= link_to l(:label_new), :controller => 'groups', :action => 'new' %> |
|
|||
18 | </p> |
|
|||
19 |
|
||||
20 | <p class="icon22 icon22-role"> |
|
|||
21 | <%= link_to l(:label_role_and_permissions), :controller => 'roles' %> |
|
|||
22 | </p> |
|
|||
23 |
|
||||
24 | <p class="icon22 icon22-tracker"> |
|
|||
25 | <%= link_to l(:label_tracker_plural), :controller => 'trackers' %> | |
|
|||
26 | <%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> | |
|
|||
27 | <%= link_to l(:label_workflow), :controller => 'workflows', :action => 'edit' %> |
|
|||
28 | </p> |
|
|||
29 |
|
||||
30 | <p class="icon22 icon22-workflow"> |
|
|||
31 | <%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %> |
|
|||
32 | </p> |
|
|||
33 |
|
||||
34 | <p class="icon22 icon22-options"> |
|
|||
35 | <%= link_to l(:label_enumerations), :controller => 'enumerations' %> |
|
|||
36 | </p> |
|
|||
37 |
|
||||
38 | <p class="icon22 icon22-settings"> |
|
|||
39 | <%= link_to l(:label_settings), :controller => 'settings' %> |
|
|||
40 | </p> |
|
|||
41 |
|
||||
42 | <% menu_items_for(:admin_menu) do |item| -%> |
|
|||
43 | <%= content_tag 'p', |
|
|||
44 | link_to(h(item.caption), item.url, item.html_options), |
|
|||
45 | :class => ["icon22", "icon22-#{item.name}"].join(' ') %> |
|
|||
46 | <% end -%> |
|
|||
47 |
|
||||
48 | <p class="icon22 icon22-plugin"> |
|
|||
49 | <%= link_to l(:label_plugins), :controller => 'admin', :action => 'plugins' %> |
|
|||
50 | </p> |
|
|||
51 |
|
||||
52 | <p class="icon22 icon22-info"> |
|
|||
53 | <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %> |
|
|||
54 | </p> |
|
|||
55 |
|
7 | |||
56 | <% html_title(l(:label_administration)) -%> |
|
8 | <% html_title(l(:label_administration)) -%> |
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
@@ -48,6 +48,23 h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord | |||||
48 | #main-menu li a:hover {background:#759FCF; color:#fff;} |
|
48 | #main-menu li a:hover {background:#759FCF; color:#fff;} | |
49 | #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;} |
|
49 | #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;} | |
50 |
|
50 | |||
|
51 | #admin-menu ul {margin: 0; padding: 0;} | |||
|
52 | #admin-menu li {margin: 0; padding: 0 0 12px 0; list-style-type:none;} | |||
|
53 | ||||
|
54 | #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;} | |||
|
55 | #admin-menu a.projects { background-image: url(../images/projects.png); } | |||
|
56 | #admin-menu a.users { background-image: url(../images/user.png); } | |||
|
57 | #admin-menu a.groups { background-image: url(../images/group.png); } | |||
|
58 | #admin-menu a.roles { background-image: url(../images/database_key.png); } | |||
|
59 | #admin-menu a.trackers { background-image: url(../images/ticket.png); } | |||
|
60 | #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); } | |||
|
61 | #admin-menu a.workflows { background-image: url(../images/ticket_go.png); } | |||
|
62 | #admin-menu a.custom_fields { background-image: url(../images/textfield.png); } | |||
|
63 | #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); } | |||
|
64 | #admin-menu a.settings { background-image: url(../images/changeset.png); } | |||
|
65 | #admin-menu a.plugins { background-image: url(../images/plugin.png); } | |||
|
66 | #admin-menu a.info { background-image: url(../images/help.png); } | |||
|
67 | ||||
51 | #main {background-color:#EEEEEE;} |
|
68 | #main {background-color:#EEEEEE;} | |
52 |
|
69 | |||
53 | #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;} |
|
70 | #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;} |
General Comments 0
You need to be logged in to leave comments.
Login now