'+settings.title+'
diff --git a/app/assets/images/desktop/select2/select2.png b/app/assets/images/desktop/select2/select2.png index 1d804ffb..7f378627 100755 Binary files a/app/assets/images/desktop/select2/select2.png and b/app/assets/images/desktop/select2/select2.png differ diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 3a8ac950..a216b8a2 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -837,8 +837,8 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('
Theme Color | -Line Color | -Text Color | -Background Color | +Theme Color | +Line Color | +Text Color | +Background Color |
---|---|---|---|---|---|---|---|
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index f370c861..ea8966dd 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -2,17 +2,22 @@
Password Managment
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh1 hp" %>
-
<% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
index 92e7afd5..f4b8c806 100644
--- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
+++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
@@ -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(){
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
index 04b437d8..a3a688fc 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
@@ -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?
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
index d70bbb49..7da71ad8 100644
--- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
+++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
@@ -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
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
new file mode 100644
index 00000000..0a4699d0
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
@@ -0,0 +1,86 @@
+
+
+ <% @writing_journals.each do |w| %>
+ <%= publication_record w, @view_by%>
+ <% end %>
+
+
+
|