diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb
index a3880acc..9ea70ae1 100644
--- a/app/assets/javascripts/desktop/journal_pages.js.erb
+++ b/app/assets/javascripts/desktop/journal_pages.js.erb
@@ -136,18 +136,21 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
$.each(journalData,function(i,journal){
$.each(journal.papers,function(j,paper){
li = null;
- li = $('
');
- li.append(''+journal.title+'
');
+ li = $(' ');
+ li.append(''+journal.title+'
');
+ var file_list = li.find('.list_t_des');
$.each(paper.files,function(k,file){
var thistitle = file.title;
- if(!file.title)
- thistitle = "Untitled File";
- var img = $('');
- li.append(img);
+ thistitle = ( thistitle.length > 8 )? thistitle.substring(0,8)+'...' : thistitle;
+ if(!file.title){
+ thistitle = "Untitled File";
+ }
+ var img = $(''+thistitle+' ');
+ file_list.append(img);
})
li.append('');
column.find("ul").append(li);
- if(counter%5==0){
+ if(counter%3==0){
$("#journal_p div#paper_list div.overview").append(column);
column = $('');
}
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index 48fd709c..5263b351 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -720,6 +720,7 @@ a:focus { outline: none; }
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
+ -webkit-text-size-adjust: none;
}
.list_item_action a {
display: block;
@@ -733,6 +734,29 @@ a:focus { outline: none; }
.list_item_action .icon-check-empty { color: #999; font-size: 20px; }
.list_item_action .icon-check { color: #333; font-size: 20px; }
+#paper_list .list_t_item.file_view {
+ height: 148px;
+}
+#paper_list .file_view .file {
+ display: inline-block;
+ width: 62px;
+ height: 50px;
+ text-align: center;
+}
+#paper_list .file_view .file:hover {
+ background-color: #ddd;
+}
+#paper_list .file_view .file img {
+ width: 24px;
+ display: block;
+ margin: 0 auto;
+ margin-top: 4px;
+}
+#paper_list .file_view .filetitle {
+ font-size: 11px;
+ -webkit-text-size-adjust: none;
+}
+
/* Journal Paper Add */
#paper_add .s_grid_con {
float: left;
@@ -779,6 +803,11 @@ a:focus { outline: none; }
line-height: 20px;
margin: 1px 1px 6px 1px;
}
+#journal_list .list_t_desc {
+ font-family: Arial, sans-serif;
+ font-size: 12px;
+ color: #999;
+}
/* Journal Co-Author */
#co_author {}
@@ -791,6 +820,7 @@ a:focus { outline: none; }
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
+ -webkit-text-size-adjust: none;
}
#co_author .g_col:first-child {
margin-left: 0;
@@ -819,7 +849,7 @@ a:focus { outline: none; }
/* Journal Co-Author Relationship*/
#co_author_relation_table .s_grid_con {
float: left;
- width: 346px;
+ width: 370px;
height: 456px;
margin-left: 12px;
padding-left: 12px;
@@ -835,19 +865,25 @@ a:focus { outline: none; }
height: 64px;
}
#co_author_relation_table .edit_co_author_relation {
- margin-left: -10px;
+ /*margin-left: -10px;*/
}
#co_author_relation_table .list_item_function a {
display: inline-block;
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
+ -webkit-text-size-adjust: none;
}
#co_author_relation_table .form_space {
margin-bottom: 10px;
- font-size: 15px;
+ font-size: 18px;
font-family: Arial, sans-serif;
}
+/* Journal New Co-Author */
+#new_co_author label {
+ margin-right: 0;
+}
+
/* App */
.app_frame {
diff --git a/app/views/desktop/co_authors/_form.html.erb b/app/views/desktop/co_authors/_form.html.erb
index 2d8aa2d9..7780b807 100644
--- a/app/views/desktop/co_authors/_form.html.erb
+++ b/app/views/desktop/co_authors/_form.html.erb
@@ -1,28 +1,28 @@
-
- <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
- <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
+
-
-
-
+
\ No newline at end of file
diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb
index c67745c4..de144196 100644
--- a/app/views/desktop/journal_pages/_form.html.erb
+++ b/app/views/desktop/journal_pages/_form.html.erb
@@ -92,10 +92,6 @@
<%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
-
-
- <%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
-
@@ -160,6 +156,9 @@
Writing
+
+ <%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
+