devin's new branch
This commit is contained in:
1 parent
dd10b3147c
commit
e7bffe4c0f
16 files changed
+484
-836
No files matched your search
+1
@@ -13,6 +13,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
|
||||
var bindHandlers = function(){ // to bind handlers for list page
|
||||
o.simple_drop_down();
|
||||
}
|
||||
bindHandlers();
|
||||
|
||||
var bindSecondaryHandlers = function(){
|
||||
$("#journal_p div#paper_list a.icon-check-empty").click(function(){
|
||||
|
||||
+6
-2
@@ -6,9 +6,13 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
|
||||
page = params[:page]
|
||||
page ||= 1
|
||||
|
||||
@per_column = 5
|
||||
if @view_by == "abstract"
|
||||
case @view_by
|
||||
when "abstract"
|
||||
@per_column = 1
|
||||
when "file"
|
||||
@per_column = 2
|
||||
else
|
||||
@per_column = 4
|
||||
end
|
||||
|
||||
if @view_by.nil?
|
||||
|
||||
+4
-3
@@ -2,7 +2,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
|
||||
def publication_record publication, view
|
||||
content_tag :li,
|
||||
"item" => "true",
|
||||
:class => "list_t_item" do
|
||||
:class => "list_t_item #{view}_view" do
|
||||
marker + \
|
||||
content(publication, view) + \
|
||||
edit_or_delete(publication)
|
||||
@@ -69,14 +69,15 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
|
||||
content_tag(:span, file.title, :class => "filetitle"),
|
||||
file.file.url,
|
||||
:class => "file",
|
||||
"target" => "_blank")
|
||||
"target" => "_blank",
|
||||
"title" => file.title)
|
||||
}.inject(:+)
|
||||
end
|
||||
|
||||
def check_file_type file
|
||||
if not file.nil?
|
||||
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
|
||||
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
|
||||
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-sm-32_32.png"
|
||||
else
|
||||
file_type = ""
|
||||
end
|
||||
|
||||
+86
@@ -0,0 +1,86 @@
|
||||
<div class="toolbar hh1">
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1"><span class="icon-check"></span></div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul id="journal_selection_options">
|
||||
<li><a class="hp hh1 admtxt" href="all" ajax-remote="false" callback-method="allnone">All</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="none" ajax-remote="false" callback-method="allnone">None</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1">More</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul>
|
||||
<li><a class="hp hh1 admtxt" href="">Delete</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Tag</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1">Tag</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul>
|
||||
<li><a class="hp hh1 admtxt" href="">All</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Starred</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">MIT</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1">Status</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul>
|
||||
<li><a class="hp hh1 admtxt" href="">All</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Published</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Pending</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1">View</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul id="journal_view_selection">
|
||||
<li><%= link_to "Journal", panel_personal_journal_desktop_journal_pages_path + "?view=journal_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
|
||||
<li><%= link_to "Title", panel_personal_journal_desktop_journal_pages_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
|
||||
<li><%= link_to "File", panel_personal_journal_desktop_journal_pages_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
|
||||
<li><%= link_to "Keywords", panel_personal_journal_desktop_journal_pages_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
|
||||
<li><%= link_to "Abstract", panel_personal_journal_desktop_journal_pages_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1">Share</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul>
|
||||
<li><a class="hp hh1 admtxt" href="">Full</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Abstract</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Friends</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Private</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Group</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1" id='ns'>New Share</div>
|
||||
<div class="admbg sdm_o">
|
||||
<ul>
|
||||
<li><a class="hp hh1 admtxt remote_url" href="<%= panel_personal_journal_plugin_writing_journals_path %>">Full</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Abstract</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Friends</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Private</a></li>
|
||||
<li><a class="hp hh1 admtxt" href="">Group</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hh1 hp sdm">
|
||||
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="400" per-column="<%= @per_column.to_s %>" pagination-var="page" >
|
||||
<% @writing_journals.each do |w| %>
|
||||
<%= publication_record w, @view_by%>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in new issue
Block a user