jro_apps/redmine Commit - r3173:9d82bff1a84f

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                 content << textilizable(journal, :notes)
                 css_classes = "wiki"
                 css_classes << " editable" if editable
-                css_classes << " gravatar-margin" if Setting.gravatar_enabled?
                 content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
               end

               def add_short_filter(field, expression)
                 return unless expression
-                parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
+                parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
                 add_filter field, (parms[0] || "="), [parms[1] || ""]
               end

                 <td class="buttons">
                 	<%= link_to l(:button_test), :action => 'test_connection', :id => source %>
                 	<%= link_to l(:button_delete), { :action => 'destroy', :id => source },
+                																										:method => :post,
                                                                     :confirm => l(:text_are_you_sure),
                                                                     :class => 'icon icon-del',
                                                                     :disabled => source.users.any? %>

             <% for journal in journals %>
               <div id="change-<%= journal.id %>" class="journal">
                 <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
+                <%= avatar(journal.user, :size => "24") %>
                 <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
             		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
-                <%= avatar(journal.user, :size => "32") %>
                 <ul>
                 <% for detail in journal.details %>
                    <li><%= show_detail(detail) %></li>

             <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
             <div class="<%= @issue.css_classes %> details">
-                    <%= avatar(@issue.author, :size => "64") %>
+                    <%= avatar(@issue.author, :size => "50") %>
                     <h3><%=h @issue.subject %></h3>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.

                 <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
             </div>
-            <h2><%=h @topic.subject %></h2>
+            <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
             <div class="message">
             <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
                   <%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
                 </div>
               <h4>
+              	<%= avatar(message.author, :size => "24") %>
                 <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %>
                 -
                 <%= authoring message.created_on, message.author %>

             <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
-            <h2><%=h @news.title %></h2>
+            <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
             <% if authorize_for('news', 'edit') %>
             <div id="edit-news" style="display:none;">
                 <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
                                                                    :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
                 </div>
-                <h4><%= authoring comment.created_on, comment.author %></h4>
+                <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
                 <%= textilizable(comment.comments) %>
             <% end if @comments.any? %>
             </div>

             <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
+                                                            :subproject_id => '!*',
                                                             "#{field_name}" => row.id %></td>
               <% for status in @statuses %>
                 <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
                                                             :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
+                                                            :subproject_id => '!*',
                                                             "status_id" => status.id,
                                                             "#{field_name}" => row.id %></td>
               <% end %>
               <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                             :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
+                                                            :subproject_id => '!*',
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "o" %></td>
               <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                             :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
+                                                            :subproject_id => '!*',
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "c" %></td>
               <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                             :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
+                                                            :subproject_id => '!*',
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "*" %></td>
             </tr>

             <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
             </div>
-            <h2><%= avatar @user %> <%=h @user.name %></h2>
+            <h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
             <div class="splitcontentleft">
             <ul>

             	margin: 0 0.5em 0 0;
             }
-            #history img.gravatar {
+            h2 img.gravatar {
             	padding: 3px;
-            	margin: 0 1.5em 1em 0;
+            	margin: -2px 4px 0 0;
+            	float: left;
+            }
+            h4 img.gravatar {
+            	padding: 3px;
+            	margin: -6px 4px 0 0;
             	float: left;
             }
             	clear: left;
             }
-            .gravatar-margin {
-              margin-left: 40px;
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }