solved conflict for member_new_ui
This commit is contained in:
Spen authored and 
saurabhbhatia committed
1 parent
9c7558847a
commit
6c514770bc
92 files changed
+3204
-2102
No files matched your search
Vendored
+21
-24
@@ -25,37 +25,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('writing_book.year') %></th>
|
||||
<th class="span3"><%= t('writing_book.title') %></th>
|
||||
<th><%= t('writing_book.title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_books" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @writing_books.each do |writing_book| %>
|
||||
|
||||
<tr id="<%= dom_id writing_book %>" class="with_action">
|
||||
<td><%= writing_book.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= writing_book.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_plugin_writing_book_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="writing_book_pagination" class="paginationFixed">
|
||||
<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
+20
-23
@@ -26,37 +26,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('writing_conference.year') %></th>
|
||||
<th class="span3"><%= t('writing_conference.title') %></th>
|
||||
<th><%= t('writing_conference.title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_conferences" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @writing_conferences.each do |writing_conference| %>
|
||||
|
||||
<tr id="<%= dom_id writing_conference %>" class="with_action">
|
||||
<td><%= writing_conference.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= writing_conference.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_conference_plugin_writing_conference_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="writing_conference_pagination" class="paginationFixed">
|
||||
<%= paginate @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
Vendored
+21
-24
@@ -25,37 +25,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('diploma.date') %></th>
|
||||
<th class="span3"><%= t('diploma.school_name') %></th>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span2"><%= t('diploma.date') %></th>
|
||||
<th><%= t('diploma.school_name') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_diplomas" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @diplomas.each do |diploma| %>
|
||||
|
||||
<tr id="<%= dom_id diploma %>" class="with_action">
|
||||
<td><%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_diploma_plugin_diploma_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="diploma_pagination" class="paginationFixed">
|
||||
<%= paginate @diplomas, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @diplomas, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
+20
-24
@@ -26,37 +26,33 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('experience.date') %></th>
|
||||
<th class="span3"><%= t('experience.organizationt_title') %></th>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span2"><%= t('experience.date') %></th>
|
||||
<th><%= t('experience.organizationt_title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_experiences" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @experiences.each do |experience| %>
|
||||
|
||||
<tr id="<%= dom_id experience %>" class="with_action">
|
||||
<td><%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_experience_plugin_experience_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="experience_pagination" class="paginationFixed">
|
||||
<%= paginate @experiences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @experiences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> </div>
|
||||
</div>
|
||||
Vendored
+20
-23
@@ -26,37 +26,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('honor.year') %></th>
|
||||
<th class="span3"><%= t('honor.award_name') %></th>
|
||||
<th><%= t('honor.award_name') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_honors" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @honors.each do |honor| %>
|
||||
|
||||
<tr id="<%= dom_id honor %>" class="with_action">
|
||||
<td><%= honor.year %></td>
|
||||
<td>
|
||||
<tr>
|
||||
<td><%= honor.year %></td>
|
||||
<td>
|
||||
<%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %>
|
||||
</td>
|
||||
</tr>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_honor_back_end_honor_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_honor_plugin_honor_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="honor_pagination" class="paginationFixed">
|
||||
<%= paginate @honors, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_honor_back_end_honor_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @honors, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
Vendored
+25
-28
@@ -24,43 +24,40 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('writing_journal.year') %></th>
|
||||
<th class="span3"><%= t('writing_journal.title') %></th>
|
||||
<th><%= t('writing_journal.title') %></th>
|
||||
<% if not @user%>
|
||||
<th class="span3"><%= t('writing_journal.authors') %></th>
|
||||
<th><%= t('writing_journal.authors') %></th>
|
||||
<% end %>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_journals" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @writing_journals.each do |writing_journal| %>
|
||||
|
||||
<tr id="<%= dom_id writing_journal %>" class="with_action">
|
||||
<td><%= writing_journal.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
|
||||
</td>
|
||||
<% if not @user%>
|
||||
<td><%= writing_journal.authors %></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= writing_journal.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
|
||||
</td>
|
||||
<% if not @user%>
|
||||
<td><%= writing_journal.authors %></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_journal_plugin_writing_journal_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="writing_journal_pagination" class="paginationFixed">
|
||||
<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
+3
-3
@@ -135,10 +135,10 @@
|
||||
<%= f.text_field :issue_no %>
|
||||
</div>
|
||||
|
||||
<div class="title">
|
||||
<div class="title">
|
||||
<%= f.label :form_to, t("personal_journal.form_to") %>
|
||||
<%= f.text_field :form_to %>
|
||||
</div>
|
||||
<%= f.text_field :form_to_start, :class=>'span1' %> ~ <%= f.text_field :form_to_end, :class=>'span1' %>
|
||||
</div>
|
||||
|
||||
<div class="title">
|
||||
<%= f.label :total_pages, t("personal_journal.total_pages") %>
|
||||
|
||||
+22
-25
@@ -26,39 +26,36 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('lab.year') %></th>
|
||||
<th class="span3"><%= t('lab.lab_title') %></th>
|
||||
<th class="span3"><%= t('lab.location') %></th>
|
||||
<th><%= t('lab.lab_title') %></th>
|
||||
<th><%= t('lab.location') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_labs" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @labs.each do |lab| %>
|
||||
|
||||
<tr id="<%= dom_id lab %>" class="with_action">
|
||||
<td><%= lab.year %></td>
|
||||
<td>
|
||||
<%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %>
|
||||
</td>
|
||||
<td><%= lab.location %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= lab.year %></td>
|
||||
<td>
|
||||
<%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %>
|
||||
</td>
|
||||
<td><%= lab.location %></td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_lab_back_end_lab_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_lab_plugin_lab_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="lab_pagination" class="paginationFixed">
|
||||
<%= paginate @labs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_lab_back_end_lab_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @labs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
Vendored
+22
-24
@@ -26,37 +26,35 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('writing_patent.publish_date') %></th>
|
||||
<th class="span3"><%= t('writing_patent.title') %></th>
|
||||
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span2"><%= t('writing_patent.publish_date') %></th>
|
||||
<th><%= t('writing_patent.title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_patents" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @writing_patents.each do |writing_patent| %>
|
||||
|
||||
<tr id="<%= dom_id writing_patent %>" class="with_action">
|
||||
<td><%= writing_patent.publish_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<tr>
|
||||
<td><%= writing_patent.publish_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %>
|
||||
</td>
|
||||
</tr>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_plugin_writing_patent_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="writing_patent_pagination" class="paginationFixed">
|
||||
<%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
Vendored
+21
-24
@@ -26,37 +26,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('project.period') %></th>
|
||||
<th class="span3"><%= t('project.project_title') %></th>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span2"><%= t('project.period') %></th>
|
||||
<th><%= t('project.project_title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_projects" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @projects.each do |project| %>
|
||||
|
||||
<tr id="<%= dom_id project %>" class="with_action">
|
||||
<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_project_plugin_project_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="project_pagination" class="paginationFixed">
|
||||
<%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/_profile.html.erb
Vendored
+21
-24
@@ -25,37 +25,34 @@
|
||||
|
||||
%>
|
||||
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('research.publish_date') %></th>
|
||||
<th class="span3"><%= t('research.title') %></th>
|
||||
<table class="table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span2"><%= t('research.publish_date') %></th>
|
||||
<th><%= t('research.title') %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_researchs" class="sort-holder">
|
||||
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<% @researchs.each do |research| %>
|
||||
|
||||
<tr id="<%= dom_id research %>" class="with_action">
|
||||
<td><%= research.publish_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= research.publish_date.strftime("%Y.%m") %></td>
|
||||
<td>
|
||||
<%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_research_back_end_research_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_research_plugin_research_path, :class => 'btn btn-primary pull-right' %>
|
||||
<div id="research_pagination" class="paginationFixed">
|
||||
<%= paginate @researchs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_research_back_end_research_path(:user_id => @user.id), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= paginate @researchs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
Reference in new issue
Block a user