publication's view update

This commit is contained in:
devin chen authored and saurabhbhatia committed 2013-07-30 16:41:48 +08:00
1 parent ae8033ea1b
commit a458a50e97
22 files changed
+864 -375

No files matched your search

@@ -1,3 +1,109 @@
/* css test*/
/* Journal Papers */
[page-name="journal_p_list"] .list_t_item .inner {
padding-left: 30px; }
[page-name="journal_p_list"] .list_item_action {
font-size: 12px;
float: left;
margin-left: -30px; }
[page-name="journal_p_list"] .list_item_action a {
display: block;
width: 20px;
height: 20px;
line-height: 20px;
margin: 1px 1px 6px 1px;
font-size: 20px; }
[page-name="journal_p_list"] .list_item_action .icon-star-empty, [page-name="journal_p_list"] .list_item_action .icon-check-empty {
color: #dddddd;
-webkit-transition: color 0.3s ease;
-moz-transition: color 0.3s ease;
transition: color 0.3s ease; }
[page-name="journal_p_list"] .list_item_action .icon-star-empty:hover, [page-name="journal_p_list"] .list_item_action .icon-check-empty:hover {
color: #aaaaaa; }
[page-name="journal_p_list"] .list_item_action .icon-star {
color: #faa732; }
[page-name="journal_p_list"] .list_item_action .icon-check {
color: #333; }
[page-name="journal_p_list"] .file_view .list_t_des {
overflow: hidden; }
[page-name="journal_p_list"] .file_view .file {
float: left;
width: 120px;
height: 50px;
padding: 6px;
margin: 1px;
position: relative;
-webkit-box-sizing: border-box;
/* webkit */
-khtml-box-sizing: border-box;
/* konqueror */
-moz-box-sizing: border-box;
/* firefox */
-ms-box-sizing: border-box;
/* ie */
box-sizing: border-box;
/* css3 */ }
[page-name="journal_p_list"] .file_view .file:hover {
background-color: #c4c4c4; }
[page-name="journal_p_list"] .file_view .file img {
width: 38px;
height: 38px;
position: absolute;
left: 6px;
top: 6px; }
[page-name="journal_p_list"] .file_view .file .filetitle {
display: block;
width: 100%;
height: 38px;
padding-left: 40px;
overflow: hidden;
-webkit-box-sizing: border-box;
/* webkit */
-khtml-box-sizing: border-box;
/* konqueror */
-moz-box-sizing: border-box;
/* firefox */
-ms-box-sizing: border-box;
/* ie */
box-sizing: border-box;
/* css3 */ }
#harry { font-size: 10px; }
/* Journal Journal list */
[page-name="journal_p_journal"] .datalist_item .inner {
padding-left: 30px; }
[page-name="journal_p_journal"] .list_item_action {
font-size: 12px;
float: left;
margin-left: -30px; }
[page-name="journal_p_journal"] .list_item_action i {
color: #999;
font-size: 20px;
display: block;
width: 20px;
height: 20px;
line-height: 20px;
margin: 1px 1px 6px 1px; }
[page-name="journal_p_journal"] .list_t_desc {
font-family: Arial, sans-serif;
font-size: 12px;
color: #999; }
/* Journal Co-Author */
[page-name="journal_p_coauthor"] .list_t_item {
height: 110px; }
[page-name="journal_p_coauthor"] .info {
font-family: Arial, sans-serif; }
[page-name="journal_p_coauthor"] .info li {
margin-bottom: 8px;
color: #999; }
[page-name="journal_p_coauthor"] .info .name {
font-size: 18px;
line-height: 24px;
color: #333; }
/* Journal Co-Author Relationship*/
[page-name="journal_p_coauthor_relation"] .edit_co_author_relation {
/*margin-left: -10px;*/ }
[page-name="journal_p_coauthor_relation"] .form_space {
margin-bottom: 10px;
font-size: 18px;
font-family: Arial, sans-serif; }
@@ -0,0 +1,124 @@
@import "desktop-helper";
/* Journal Papers */
[page-name="journal_p_list"] {
.list_t_item .inner { padding-left: 30px; }
.list_item_action {
font-size: 12px;
float: left;
margin-left: -30px;
a {
display: block;
width: 20px;
height: 20px;
line-height: 20px;
margin: 1px 1px 6px 1px;
font-size: 20px;
}
.icon-star-empty, .icon-check-empty {
color: $gray;
@include transition-type(color,0.3);
&:hover {
color: darken($gray, 20%);
}
}
.icon-star { color: #faa732; }
.icon-check { color: #333; }
}
.file_view {
.list_t_des {
overflow: hidden;
}
.file {
float: left;
width: 120px;
height: 50px;
padding: 6px;
margin: 1px;
position: relative;
@include box-sizing;
&:hover {
background-color: darken($gray, 10%);
}
img {
width: 38px;
height: 38px;
position: absolute;
left: 6px;
top: 6px;
}
.filetitle {
display: block;
width: 100%;
height: 38px;
padding-left: 40px;
overflow: hidden;
@include box-sizing;
}
}
}
}
/* Journal Journal list */
[page-name="journal_p_journal"] {
.datalist_item .inner {
padding-left: 30px;
}
.list_item_action {
font-size: 12px;
float: left;
margin-left: -30px;
}
.list_item_action i {
color: #999;
font-size: 20px;
display: block;
width: 20px;
height: 20px;
line-height: 20px;
margin: 1px 1px 6px 1px;
}
.list_t_desc {
font-family: Arial, sans-serif;
font-size: 12px;
color: #999;
}
}
/* Journal Co-Author */
[page-name="journal_p_coauthor"] {
.list_t_item {
height: 110px;
}
.list_item_function {}
.list_item_function a {}
.info {
font-family: Arial, sans-serif;
}
.info li {
margin-bottom: 8px;
color: #999;
}
.info .name {
font-size: 18px;
line-height: 24px;
color: #333;
}
}
/* Journal Co-Author Relationship*/
[page-name="journal_p_coauthor_relation"]{
.edit_co_author_relation {
/*margin-left: -10px;*/
}
.form_space {
margin-bottom: 10px;
font-size: 18px;
font-family: Arial, sans-serif;
}
}
@@ -2,7 +2,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
:class => "list_t_item #{view}_view" do
:class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
marker + \
content(publication, view) + \
edit_or_delete(publication)
@@ -1,11 +1,19 @@
<%= f.text_field :relation %>
<!--
<#%= f.fields_for :journal_co_author_relation_translations do |f| %>
<#%= f.text_field locale,
value: (@journal_co_author_relation.co_author_relation_translations[locale] rescue nil) %>
<#% end %>
-->
<%= f.submit t("save"), class: "ini_input hp hh1 thmtxt thmc2", style: "margin-left: 10px;" %>
<% if not @journal_co_author_relation.new_record? %>
<%= submit_tag t("cancel"), :type => "button", class: "bt-cancel-type ini_input hp hh1 thmtxt" %>
<% end %>
<ul class="s_form">
<li class="s_grid_row">
<% if @journal_co_author_relation.new_record? %>
<%= f.text_field :relation, class: "s_grid s_grid_6" %>
<% else %>
<%= f.text_field :relation, class: "s_grid s_grid_4" %>
<% end %>
<!--
<#%= f.fields_for :journal_co_author_relation_translations do |f| %>
<#%= f.text_field locale,
value: (@journal_co_author_relation.co_author_relation_translations[locale] rescue nil) %>
<#% end %>
-->
<%= f.submit t("save"), class: "s_grid s_grid_2 ini_input hp hh1 thmtxt thmc2" %>
<% if not @journal_co_author_relation.new_record? %>
<%= submit_tag t("cancel"), :type => "button", class: "bt-cancel-type s_grid s_grid_2 ini_input hp hh1 thmtxt" %>
<% end %>
</li>
</ul>
@@ -1,5 +1,5 @@
<%= javascript_include_tag "personal_journal" %>
<%= stylesheet_link_tag "/assets/personal_journal/desktop/journal_pages" %>
<%= javascript_include_tag "personal_journal" %>
<div id="journal_p">
<div id="content">
<div id="header" class="hh2">