diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index bcf7cba43..ecfff0357 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -4,16 +4,16 @@

<%=l(:label_project_plural)%>

- - +
+ <%= sort_header_tag('name', :caption => l(:label_project)) %> <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %> - - - + + + <% for project in @projects %> "> <% end %> +
<%=l(:field_description)%> <%=l(:field_is_public)%> <%=l(:label_subproject_plural)%>
<%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %> @@ -26,6 +26,7 @@

<%= pagination_links_full @project_pages %> diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml index 149a1313a..d65e56d96 100644 --- a/app/views/auth_sources/list.rhtml +++ b/app/views/auth_sources/list.rhtml @@ -4,28 +4,25 @@

<%=l(:label_auth_source_plural)%>

- - +
+ - - + + <% for source in @auth_sources %> "> - - - + + + <% end %> +
<%=l(:field_name)%> <%=l(:field_type)%> <%=l(:field_host)%>
<%= link_to source.name, :action => 'edit', :id => source%> <%= source.auth_method_name %> <%= source.host %> - <%= link_to l(:button_test), :action => 'test_connection', :id => source %> - - <%= button_to l(:button_delete), { :action => 'destroy', :id => source }, :confirm => l(:text_are_you_sure), :class => "button-small" %> -
<%= link_to l(:button_test), :action => 'test_connection', :id => source %><%= button_to l(:button_delete), { :action => 'destroy', :id => source }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
<%= pagination_links_full @auth_source_pages %> diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index 8e4573aed..eef3e8631 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -1,7 +1,7 @@

<%=l(:label_custom_field_plural)%>

- - +
+ @@ -9,7 +9,8 @@ - + + <% for custom_field in @custom_fields %> "> @@ -23,6 +24,7 @@ <% end %> +
<%=l(:field_name)%> <%=l(:field_type)%> <%=l(:field_field_format)%><%=l(:field_is_for_all)%> <%=l(:label_used_by)%>
<%= link_to custom_field.name, :action => 'edit', :id => custom_field %>
<%= pagination_links_full @custom_field_pages %> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index 116376b70..c81c88127 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -4,26 +4,25 @@

<%=l(:label_issue_status_plural)%>

- - +
+ - - - + + <% for status in @issue_statuses %> "> - + - - + <% end %> +
<%=l(:field_status)%> <%=l(:field_is_default)%> <%=l(:field_is_closed)%><%=l(:field_html_color)%>
<%= link_to status.name, :action => 'edit', :id => status %>
<%= link_to status.name, :action => 'edit', :id => status %>		 <%= image_tag 'true' if status.is_default? %><%= image_tag 'true' if status.is_closed? %>
 
<%= image_tag 'true' if status.is_closed? %> <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
<%= pagination_links_full @issue_status_pages %> \ No newline at end of file diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml index cd2355376..10d880f43 100644 --- a/app/views/issues/_list_simple.rhtml +++ b/app/views/issues/_list_simple.rhtml @@ -1,28 +1,25 @@ <% if issues.length > 0 %> - - - -
- - +
+ - + + <% for issue in issues %> "> - + - <% end %> -
# <%=l(:field_tracker)%> <%=l(:field_subject)%>
- <%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
- 		+ <%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %> +

<%= issue.project.name %> - <%= issue.tracker.name %>
<%= issue.status.name %> - <%= format_time(issue.updated_on) %>

<%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %>
-
+ <% end %> + + <% else %> <%=l(:label_no_data)%> <% end %> \ No newline at end of file diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 85b550b75..b2169fd4d 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -91,7 +91,7 @@ <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> - <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %> + <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %> <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> <% end %> diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml index fd221bcb4..e57a790cb 100644 --- a/app/views/my/blocks/_calendar.rhtml +++ b/app/views/my/blocks/_calendar.rhtml @@ -9,18 +9,19 @@ @issues ||= [] %> - - - +
+ + <% 1.upto(7) do |d| %> - + <% end %> - + + <% day = @date_from while day <= @date_to if day.cwday == 1 %> - + <% end %> +
<%= day_name(d) %><%= day_name(d) %>
<%= day.cweek %><%= day.cweek %>">

<%= day==Date.today ? "#{day.day}" : day.day %>

@@ -42,4 +43,5 @@ while day <= @date_to day = day + 1 end %>
\ No newline at end of file diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 9b0c26ed4..7f7f3813c 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -25,18 +25,21 @@
- - - +
+ + + <% 1.upto(7) do |d| %> - + <% end %> + + <% day = @date_from while day <= @date_to if day.cwday == 1 %> - + <% end %> +
<%= day_name(d) %><%= day_name(d) %>
<%= day.cweek %><%= day.cweek %>">

<%= day==Date.today ? "#{day.day}" : day.day %>

@@ -58,9 +61,9 @@ while day <= @date_to day = day + 1 end %>
-
<%= image_tag 'arrow_from' %>  <%= l(:text_tip_task_begin_day) %>
<%= image_tag 'arrow_to' %>  <%= l(:text_tip_task_end_day) %>
<%= image_tag 'arrow_bw' %>  <%= l(:text_tip_task_begin_end_day) %>
\ No newline at end of file diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml index 69e2c064f..59580797d 100644 --- a/app/views/projects/list.rhtml +++ b/app/views/projects/list.rhtml @@ -1,12 +1,12 @@

<%=l(:label_public_projects)%>

- - +
+ <%= sort_header_tag('name', :caption => l(:label_project)) %> <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %> - - + + <% for project in @projects %> "> <% end %> +
<%=l(:field_description)%>
<%= link_to project.name, :action => 'show', :id => project %> @@ -14,6 +14,7 @@ <%= format_date(project.created_on) %>
<%= pagination_links_full @project_pages %> diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index 61c6d2c80..d2173bae1 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -6,8 +6,8 @@ <% delete_allowed = authorize_for('versions', 'destroy_file') %> - - +
+ @@ -15,11 +15,11 @@ <% if delete_allowed %><% end %> - - + + <% for version in @versions %> <% unless version.attachments.empty? %> - + <% for file in version.attachments %> "> @@ -40,4 +40,5 @@ reset_cycle %> <% end %> <% end %> +
<%=l(:field_version)%> <%=l(:field_filename)%> <%=l(:label_date)%>D/L MD5
<%= image_tag 'package' %> <%= version.name %>
<%= image_tag 'package' %> <%= version.name %>
\ No newline at end of file diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml index 190aab838..a8b1db7bc 100644 --- a/app/views/projects/list_issues.rhtml +++ b/app/views/projects/list_issues.rhtml @@ -38,54 +38,44 @@

<%= l(:label_no_data) %>

<% else %>   - - - - - -
<%= check_all_links 'issues_form' %> - <%= l(:label_per_page) %>: - <%= start_form_tag %> - <%= select_tag 'per_page', options_for_select(@results_per_page_options, @results_per_page), :class => 'select-small'%> - <%= submit_tag l(:button_apply), :class => 'button-small'%> - <%= end_form_tag %> -
<%= start_form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %> - - - - +
+ + <%= sort_header_tag('issues.id', :caption => '#') %> - <%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %> <%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %> + <%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %> <%= sort_header_tag('users.lastname', :caption => l(:field_author)) %> <%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %> <%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %> - + + <% for issue in @issues %> "> - - - + + + - <% end %> + <% end %> +
<%=l(:field_subject)%>
<%= check_box_tag "issue_ids[]", issue.id %><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %><%= issue.status.name %><%= check_box_tag "issue_ids[]", issue.id %><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %> <%= issue.tracker.name %>
<%= issue.status.name %>		 <%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %> <%= issue.author.display_name %> <%= format_time(issue.created_on) %> <%= format_time(issue.updated_on) %>
<%= l(:label_export_to) %> -<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'pic picCsv' %>, +<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon file' %>, <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %>
-

+ +<%= submit_tag l(:button_move), :class => "button-small" %> +<%= end_form_tag %> +  <%= pagination_links_full @issue_pages %> [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ] -

-<%= submit_tag l(:button_move) %> -<%= end_form_tag %> + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml index 12a16c1e7..1d791e0c7 100644 --- a/app/views/reports/_details.rhtml +++ b/app/views/reports/_details.rhtml @@ -2,17 +2,17 @@

<%=l(:label_no_data)%>

<% else %> <% col_width = 70 / (@statuses.length+3) %> - - - +
+ + <% for status in @statuses %> - + <% end %> - - - - - + + + + + <% for row in rows %> "> -<% end %> +<% end %> +
<%= status.name %>
<%= status.name %>		<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
<%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, @@ -40,8 +40,9 @@ :set_filter => 1, "#{field_name}" => row.id, "status_id" => "*" %>
<% end reset_cycle %> \ No newline at end of file diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml index 778b9cbde..24cbd9b7f 100644 --- a/app/views/reports/_simple.rhtml +++ b/app/views/reports/_simple.rhtml @@ -1,14 +1,14 @@ <% if @statuses.empty? or rows.empty? %>

<%=l(:label_no_data)%>

<% else %> - - - - - - - - +
<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
+ + + + + + + <% for row in rows %> "> -<% end %> +<% end %> +
<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
<%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, @@ -29,8 +29,9 @@ :set_filter => 1, "#{field_name}" => row.id, "status_id" => "*" %>
<% end reset_cycle %> \ No newline at end of file diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index 9ef566892..0e8109c8b 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -4,12 +4,12 @@

<%=l(:label_role_plural)%>

- - +
+ - - + + <% for role in @roles %> "> @@ -17,6 +17,7 @@ <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %> <% end %> +
<%=l(:label_role)%>
<%= link_to role.name, :action => 'edit', :id => role %>
<%= pagination_links_full @role_pages %> \ No newline at end of file diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 0e8e5c330..188562684 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -4,12 +4,12 @@

<%=l(:label_tracker_plural)%>

- - +
+ - - + + <% for tracker in @trackers %> "> @@ -18,6 +18,7 @@ <% end %> +
<%=l(:label_tracker)%>
<%= link_to tracker.name, :action => 'edit', :id => tracker %>
<%= pagination_links_full @tracker_pages %> \ No newline at end of file diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index 9dc8eb34c..610234625 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -4,8 +4,8 @@

<%=l(:label_user_plural)%>

- - +
+ <%= sort_header_tag('login', :caption => l(:field_login)) %> <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %> <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %> @@ -14,8 +14,9 @@ <%= sort_header_tag('status', :caption => l(:field_status)) %> <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %> <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %> - - + + + <% for user in @users %> "> @@ -39,6 +40,7 @@ <% end %> +
<%= link_to user.login, :action => 'edit', :id => user %>

<%= pagination_links_full @user_pages %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 25b46c85a..9681103db 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -49,7 +49,6 @@ color:#303030; #header{ height:4.5em; -/*width:758px;*/ margin:0; background:#467aa7; color:#ffffff; @@ -60,7 +59,7 @@ margin-bottom:1px; padding:10px 0 0 20px; font-size:2em; background-color:inherit; -color:#fff; /*rgb(152, 26, 33);*/ +color:#fff; letter-spacing:-1px; font-weight:bold; font-family: Trebuchet MS,Georgia,"Times New Roman",serif; @@ -79,7 +78,6 @@ font-family: Trebuchet MS,Georgia,"Times New Roman",serif; #navigation{ height:2.2em; line-height:2.2em; -/*width:758px;*/ margin:0; background:#578bb8; color:#ffffff; @@ -105,7 +103,6 @@ display:block; padding:0px 10px 0px 22px; font-size:0.8em; font-weight:normal; -/*text-transform:uppercase;*/ text-decoration:none; background-color:inherit; color: #ffffff; @@ -137,6 +134,16 @@ background-color: #80b0da; .picCsv { background: url(../images/csv.png) no-repeat 4px 50%;} .pic { padding-left: 18px; margin-left: 3px; } + +.icon { + background-position: 0% 40%; + background-repeat: no-repeat; + padding-left: 20px; +} + +.folder { background-image: url(../images/folder.png); } +.file { background-image: url(../images/file.png); } + /**************** Content styles ****************/ html>body #content { @@ -145,13 +152,10 @@ min-height: 500px; } #content{ -/*float:right;*/ -/*width:530px;*/ width: auto; height:500px; font-size:0.9em; padding:20px 10px 10px 20px; -/*position: absolute;*/ margin-left: 120px; border-left: 1px dashed #c0c0c0; @@ -170,6 +174,7 @@ font-family: Trebuchet MS,Georgia,"Times New Roman",serif; #content h2 a{font-weight:normal;} #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;} +#content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;} #content a:hover,#subcontent a:hover{text-decoration:underline;} #content ul,#content ol{margin:0 5px 16px 35px;} #content dl{margin:0 5px 10px 25px;} @@ -179,37 +184,16 @@ font-family: Trebuchet MS,Georgia,"Times New Roman",serif; /***********************************************/ -/* -form{ - padding:15px; - margin:0 0 20px 0; - border:1px solid #c0c0c0; - background-color:#CEE1ED; - width:600px; -} -*/ - form { display: inline; } -.noborder { - border:0px; - background-color:#fff; - width:100%; -} - -textarea { - padding:0; - margin:0; -} - blockquote { padding-left: 6px; border-left: 2px solid #ccc; } -input { +input, select { vertical-align: middle; } @@ -218,30 +202,18 @@ input.button-small font-size: 0.8em; } -select { - vertical-align: middle; -} - .select-small { - border: 1px solid #7F9DB9; - padding: 1px; font-size: 0.8em; } -.active-filter -{ - background-color: #F9FA9E; - -} - label { font-weight: bold; font-size: 1em; } fieldset { - border:1px solid #7F9DB9; + border:1px solid #c0c0c0; padding: 6px; } @@ -254,56 +226,52 @@ legend { color: #bb0000; } -table.listTableContent { - border:1px solid #578bb8; - width:100%; - border-collapse: collapse; -} - -table.listTableContent td { - padding:2px; -} - -tr.ListHead { - background-color:#467aa7; - color:#FFFFFF; - text-align:center; -} - -tr.ListHead a { - color:#FFFFFF; - text-decoration:underline; -} - .odd { - background-color:#f0f1f2; + background-color:#f6f7f8; } .even { background-color: #fff; } -table.reportTableContent { - border:1px solid #c0c0c0; - width:99%; - border-collapse: collapse; -} - -table.reportTableContent td { - padding:2px; -} - -table.calenderTable { - border:1px solid #578bb8; - width:99%; - border-collapse: collapse; -} - -table.calenderTable td { - border:1px solid #578bb8; -} - hr { border:none; border-bottom: dotted 1px #c0c0c0; } +div.square { + border: 1px solid #999; + float: left; + margin: .4em .5em 0 0; + overflow: hidden; + width: .6em; height: .6em; +} + +table p { + margin:0; + padding:0; +} + +/********** Table used to display lists of things ***********/ + +table.list { + width:100%; + border-collapse: collapse; + border: 1px dotted #d0d0d0; + margin-bottom: 6px; +} + +table.with-cells td { + border: 1px solid #d7d7d7; +} + +table.list thead th { + text-align: center; + background: #eee; + border: 1px solid #d7d7d7; +} + +table.list tbody th { + font-weight: normal; + background: #eed; + border: 1px solid #d7d7d7; +} /**************** Sidebar styles ****************/ @@ -337,31 +305,10 @@ font-family: Trebuchet MS,Georgia,"Times New Roman",serif; .menublock li ul li{margin-bottom:0;} .menublock li ul a{font-weight:normal;} -/**************** Searchbar styles ****************/ - -#searchbar{margin:0 0 20px 0;} -#searchbar form fieldset{margin-left:10px; border:0 solid;} - -#searchbar #s{ -height:1.2em; -width:110px; -margin:0 5px 0 0; -border:1px solid #a0a0a0; -} - -#searchbar #searchbutton{ -width:auto; -padding:0 1px; -border:1px solid #808080; -font-size:0.9em; -text-align:center; -} - /**************** Footer styles ****************/ #footer{ clear:both; -/*width:758px;*/ padding:5px 0; margin:0; font-size:0.9em; @@ -400,7 +347,6 @@ overflow:hidden; width:12px; height:12px; background-repeat: no-repeat; -cursor:hand; cursor:pointer; background-image:url('../images/close.png'); } @@ -438,12 +384,6 @@ line-height:1.5em; cursor: move; } -.topright{ -position: absolute; -right: 25px; -top: 100px; -} - .login { width: 50%; text-align: left; @@ -455,14 +395,6 @@ img.calendar-trigger { margin-left: 4px; } -#history h4, #comments h4 { - font-size: 1em; - margin-bottom: 12px; - margin-top: 20px; - font-weight: normal; - border-bottom: dotted 1px #c0c0c0; -} - #history p { margin-left: 34px; } diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css index efdf3d264..eb83da103 100644 --- a/public/stylesheets/jstoolbar.css +++ b/public/stylesheets/jstoolbar.css @@ -3,7 +3,6 @@ } .jstEditor textarea, .jstEditor iframe { margin: 0; - border: 1; } .jstHandle { diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css index 658fb9050..c2b477edf 100644 --- a/public/stylesheets/scm.css +++ b/public/stylesheets/scm.css @@ -1,47 +1,8 @@ - -div.square { - border: 1px solid #999; - float: left; - margin: .4em .5em 0 0; - overflow: hidden; - width: .6em; height: .6em; -} - div.action_M { background: #fd8 } div.action_D { background: #f88 } div.action_A { background: #bfb } -table.list { - width:100%; - border-collapse: collapse; - border: 1px dotted #d0d0d0; - margin-bottom: 6px; -} - -table.list thead th { - text-align: center; - background: #eee; - border: 1px solid #d7d7d7; -} - -table.list tbody th { - font-weight: normal; - text-align: center; - background: #eed; - border: 1px solid #d7d7d7; -} - -.icon { - background-position: 0% 40%; - background-repeat: no-repeat; - padding-left: 20px; -} - -.folder { background-image: url(../images/folder.png); } -.file { background-image: url(../images/file.png); } - - tr.spacing { border: 1px solid #d7d7d7; @@ -58,9 +19,4 @@ tr.spacing { .line-code { font-family: "Courier New", monospace; font-size: 1em; -} - -table p { - margin:0; - padding:0; } \ No newline at end of file