parent
84e8a40174
commit
66aa72d210
File diff suppressed because it is too large
Load Diff
@ -1,101 +1,101 @@
|
|||||||
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
||||||
<p class="subtitle">
|
<p class="subtitle">
|
||||||
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
||||||
</p>
|
</p>
|
||||||
<div id="activity">
|
<div id="activity">
|
||||||
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
||||||
<h3></h3>
|
<h3></h3>
|
||||||
<div>
|
<div>
|
||||||
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
|
||||||
<div class="issue-note">
|
<div class="issue-note">
|
||||||
<table width="660px" border="0" align="center">
|
<table width="660px" border="0" align="center">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top" width="50" >
|
<td colspan="2" valign="top" width="50" >
|
||||||
<!--img src="/images/new/user.jpg" width="40" height="40"/-->
|
<!--img src="/images/new/user.jpg" width="40" height="40"/-->
|
||||||
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
|
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<table width="580px" border="0">
|
<table width="580px" border="0">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top">
|
<td colspan="2" valign="top">
|
||||||
<strong>
|
<strong>
|
||||||
<%= h(e.project) if @project.nil? || @project != e.project %>
|
<%= h(e.project) if @project.nil? || @project != e.project %>
|
||||||
</strong>
|
</strong>
|
||||||
<span class="font_lighter">
|
<span class="font_lighter">
|
||||||
<%= l(:label_new_activity) %>
|
<%= l(:label_new_activity) %>
|
||||||
</span>
|
</span>
|
||||||
<%= link_to format_activity_title(e.event_title), e.event_url %>
|
<%= link_to format_activity_title(e.event_title), e.event_url %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" width="580px" >
|
<td colspan="2" width="580px" >
|
||||||
<p class="font_description">
|
<p class="font_description">
|
||||||
<%= format_activity_description(e.event_description) %>
|
<%= format_activity_description(e.event_description) %>
|
||||||
</p>
|
</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left">
|
<td align="left">
|
||||||
<a class="font_lighter">
|
<a class="font_lighter">
|
||||||
<%= format_activity_day(day) %>
|
<%= format_activity_day(day) %>
|
||||||
<%= format_time(e.event_datetime, false) %>
|
<%= format_time(e.event_datetime, false) %>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td width="200" align="center" class="a">
|
<td width="200" align="center" class="a">
|
||||||
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
</div>
|
</div>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
</div>
|
</div>
|
||||||
<!--end-->
|
<!--end-->
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<ul>
|
<ul>
|
||||||
<%= pagination_links_full @activity_pages%>
|
<%= pagination_links_full @activity_pages%>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
|
<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
|
||||||
|
|
||||||
<% other_formats_links do |f| %>
|
<% other_formats_links do |f| %>
|
||||||
<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
|
<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
|
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% content_for :sidebar do %>
|
<% content_for :sidebar do %>
|
||||||
<%= form_tag({}, :method => :get) do %>
|
<%= form_tag({}, :method => :get) do %>
|
||||||
<h3><%= l(:label_activity) %></h3>
|
<h3><%= l(:label_activity) %></h3>
|
||||||
<p>
|
<p>
|
||||||
<% @activity.event_types.each do |t| %>
|
<% @activity.event_types.each do |t| %>
|
||||||
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
|
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
|
||||||
<label for="show_<%= t%>">
|
<label for="show_<%= t%>">
|
||||||
<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
|
<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
|
||||||
</label>
|
</label>
|
||||||
<br />
|
<br />
|
||||||
<% end %>
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
<% if @project && @project.descendants.active.any? %>
|
<% if @project && @project.descendants.active.any? %>
|
||||||
<%= hidden_field_tag 'with_subprojects', 0 %>
|
<%= hidden_field_tag 'with_subprojects', 0 %>
|
||||||
<p>
|
<p>
|
||||||
<label>
|
<label>
|
||||||
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %>
|
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %>
|
||||||
<%= l(:label_subproject_plural)%>
|
<%= l(:label_subproject_plural)%>
|
||||||
</label>
|
</label>
|
||||||
</p>
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
|
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
|
||||||
<p>
|
<p>
|
||||||
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
|
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
|
||||||
</p>
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% html_title(l(:label_activity), @author) -%>
|
<% html_title(l(:label_activity), @author) -%>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,53 +1,53 @@
|
|||||||
<div class="top-content">
|
<div class="top-content">
|
||||||
<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
|
<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
|
||||||
<table width="940px">
|
<table width="940px">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
|
<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
|
||||||
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
|
||||||
<td rowspan="2">
|
<td rowspan="2">
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
<% unless User.current.user_extensions.identity == 1 %>
|
<% unless User.current.user_extensions.identity == 1 %>
|
||||||
<%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
|
<%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
|
||||||
<!-- end longjun -->
|
<!-- end longjun -->
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td rowspan="2" >
|
<td rowspan="2" >
|
||||||
<div class="project-search" style="float: right">
|
<div class="project-search" style="float: right">
|
||||||
<%= text_field_tag 'name', params[:name], :size => 30 %>
|
<%= text_field_tag 'name', params[:name], :size => 30 %>
|
||||||
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
||||||
<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
|
<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding-left: 8px">
|
<td style="padding-left: 8px">
|
||||||
<a>
|
<a>
|
||||||
<%= link_to request.host()+"/contests", contests_path %>
|
<%= link_to request.host()+"/contests", contests_path %>
|
||||||
<!-- end longjun -->
|
<!-- end longjun -->
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td >
|
<td >
|
||||||
<%=link_to l(:field_homepage), home_path %> >
|
<%=link_to l(:field_homepage), home_path %> >
|
||||||
<%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
|
<%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
|
||||||
<!-- end longjun -->
|
<!-- end longjun -->
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% if @contests.size > 0%>
|
<% if @contests.size > 0%>
|
||||||
<%= sort_contest(@s_state)%>
|
<%= sort_contest(@s_state)%>
|
||||||
<div id="bid-show" class="projects-index">
|
<div id="bid-show" class="projects-index">
|
||||||
<%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
|
<%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
|
||||||
</div>
|
</div>
|
||||||
<% elsif @is_search%>
|
<% elsif @is_search%>
|
||||||
<%= render :partial => "layouts/no_content"%>
|
<%= render :partial => "layouts/no_content"%>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= sort_contest(@s_state)%>
|
<%= sort_contest(@s_state)%>
|
||||||
<div id="bid-show" class="projects-index">
|
<div id="bid-show" class="projects-index">
|
||||||
<%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
|
<%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% html_title l(:label_contest_list)%>
|
<% html_title l(:label_contest_list)%>
|
||||||
|
|||||||
@ -1,26 +1,26 @@
|
|||||||
<%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
|
<%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
|
||||||
<div class="box tabular settings">
|
<div class="box tabular settings">
|
||||||
<p>
|
<p>
|
||||||
<%= setting_check_box :default_projects_public %>
|
<%= setting_check_box :default_projects_public %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= setting_multiselect(:default_projects_modules,
|
<%= setting_multiselect(:default_projects_modules,
|
||||||
Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %>
|
Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= setting_multiselect(:default_projects_tracker_ids, Tracker.sorted.all.collect {|t| [t.name, t.id.to_s]}) %>
|
<%= setting_multiselect(:default_projects_tracker_ids, Tracker.sorted.all.collect {|t| [t.name, t.id.to_s]}) %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= setting_check_box :sequential_project_identifiers %>
|
<%= setting_check_box :sequential_project_identifiers %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p style="display: none;"><%= setting_select :new_project_user_role_id, Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
|
<p style="display: none;"><%= setting_select :new_project_user_role_id, Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
|
||||||
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
|
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%= submit_tag l(:button_save) %>
|
<%= submit_tag l(:button_save) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,33 +1,33 @@
|
|||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%= wiki_page_breadcrumb(@page) %>
|
<%= wiki_page_breadcrumb(@page) %>
|
||||||
|
|
||||||
<h3>
|
<h3>
|
||||||
<%= h(@page.pretty_title) %>
|
<%= h(@page.pretty_title) %>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= l(:label_version) %>
|
<%= l(:label_version) %>
|
||||||
<%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
<%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
||||||
<em>
|
<em>
|
||||||
(<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>,
|
(<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>,
|
||||||
<%= format_time(@diff.content_from.updated_on) %>)
|
<%= format_time(@diff.content_from.updated_on) %>)
|
||||||
</em>
|
</em>
|
||||||
→
|
→
|
||||||
<%= l(:label_version) %>
|
<%= l(:label_version) %>
|
||||||
<%= link_to @diff.content_to.version, :action => 'show',
|
<%= link_to @diff.content_to.version, :action => 'show',
|
||||||
:id => @page.title, :project_id => @page.project,
|
:id => @page.title, :project_id => @page.project,
|
||||||
:version => @diff.content_to.version %>
|
:version => @diff.content_to.version %>
|
||||||
/
|
/
|
||||||
<%= @page.content.version %>
|
<%= @page.content.version %>
|
||||||
<em>
|
<em>
|
||||||
(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)%>,
|
(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)%>,
|
||||||
<%= format_time(@diff.content_to.updated_on) %>)
|
<%= format_time(@diff.content_to.updated_on) %>)
|
||||||
</em>
|
</em>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
|
<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
|
||||||
<%= simple_format_without_paragraph @diff.to_html %>
|
<%= simple_format_without_paragraph @diff.to_html %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,62 +1,62 @@
|
|||||||
<%= wiki_page_breadcrumb(@page) %>
|
<%= wiki_page_breadcrumb(@page) %>
|
||||||
|
|
||||||
<script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
|
<script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
|
||||||
<h3 style="word-break: break-all;word-wrap: break-word;">
|
<h3 style="word-break: break-all;word-wrap: break-word;">
|
||||||
<%= h @page.pretty_title %>
|
<%= h @page.pretty_title %>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<%= form_for @content, :as => :content,
|
<%= form_for @content, :as => :content,
|
||||||
:url => {:action => 'update', :id => @page.title},
|
:url => {:action => 'update', :id => @page.title},
|
||||||
:html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
|
:html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
|
||||||
<%= f.hidden_field :version %>
|
<%= f.hidden_field :version %>
|
||||||
<% if @section %>
|
<% if @section %>
|
||||||
<%= hidden_field_tag 'section', @section %>
|
<%= hidden_field_tag 'section', @section %>
|
||||||
<%= hidden_field_tag 'section_hash', @section_hash %>
|
<%= hidden_field_tag 'section_hash', @section_hash %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= error_messages_for 'content' %>
|
<%= error_messages_for 'content' %>
|
||||||
|
|
||||||
<div class="actions" style="max-width:680px">
|
<div class="actions" style="max-width:680px">
|
||||||
<p style="max-width:680px;">
|
<p style="max-width:680px;">
|
||||||
<%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %>
|
<%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %>
|
||||||
</p>
|
</p>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var ckeditor=CKEDITOR.replace('editor02',{height: '300'});
|
var ckeditor=CKEDITOR.replace('editor02',{height: '300'});
|
||||||
</script>
|
</script>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box tabular">
|
<div class="box tabular">
|
||||||
<% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
|
<% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
|
||||||
<%= fields_for @page do |fp| %>
|
<%= fields_for @page do |fp| %>
|
||||||
<p>
|
<p>
|
||||||
<label>
|
<label>
|
||||||
<%= l(:field_parent_title) %>
|
<%= l(:field_parent_title) %>
|
||||||
</label>
|
</label>
|
||||||
<%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
|
<%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
|
||||||
</p>
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<p style="width: 100%;">
|
<p style="width: 100%;">
|
||||||
<label>
|
<label>
|
||||||
<%= l(:field_comments) %>
|
<%= l(:field_comments) %>
|
||||||
</label>
|
</label>
|
||||||
<%= f.text_field :comments, :style => "width:75%;" %>
|
<%= f.text_field :comments, :style => "width:75%;" %>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<label>
|
<label>
|
||||||
<%=l(:label_attachment_plural)%>
|
<%=l(:label_attachment_plural)%>
|
||||||
</label>
|
</label>
|
||||||
<%= render :partial => 'attachments/form' %>
|
<%= render :partial => 'attachments/form' %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= submit_tag l(:button_save) %>
|
<%= submit_tag l(:button_save) %>
|
||||||
</p>
|
</p>
|
||||||
<%= wikitoolbar_for 'content_text' %>
|
<%= wikitoolbar_for 'content_text' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div id="preview" class="wiki"></div>
|
<div id="preview" class="wiki"></div>
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= robot_exclusion_tag %>
|
<%= robot_exclusion_tag %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% html_title @page.pretty_title %>
|
<% html_title @page.pretty_title %>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue