developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'desktop_work' into desktop 

* desktop_work:
  app manager changed plus some changes
  section page fixed..
  section page fixed..
  add browser compatibility page

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
This commit is contained in:
Rueshyna 2013-03-14 19:00:06 +08:00
parent 61cc8f0f54 8ab4e90a06
commit 2746616610
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb vendored
View File

@ -40,6 +40,7 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorRelationsController
if @conference_co_author_relation.update_attributes(params[:conference_co_author_relation])
@conference_co_author_relations = ConferenceCoAuthorRelation.all
newv = render_to_string partial: "show_form", object: @conference_co_author_relations
newv = '<div class="overview" content-layout="datalist" per-column="4" base-width="300">' + newv + '</div>'
render json: {success: true, msg: t('update_success'), newvalue: newv}.to_json
else
error_msg = @conference_co_author.errors.full_messages.join("<br />")

6
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendored
View File

@ -77,11 +77,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<% if @view_by.eql?"abstract" %>
<div class="overview" content-layout="datalist" per-column="1" base-width="300" pagination-var="page">
<% else %>
<div class="overview" content-layout="datalist" per-column="5" base-width="300" pagination-var="page">
<% end %>
<div class="overview" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="page" >
<% @writing_journals.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>