developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 

* 'publication' of https://github.com/Rulingcom/orbit:
  journal list
  view update
This commit is contained in:
Rueshyna 2012-12-05 16:19:53 +08:00
parent 1be794328a e39e6536f5
commit 359e0f113f
6 changed files with 99 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/desktop/journal_pages.js.erb
View File

@ -238,10 +238,9 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
this.initializeJournalPapers.journal = function(){ // to open add pages in journal papers page
var bindHandlers = function(){ // to bind handlers for add page
o.simple_drop_down();
o.tinyscrollbar_ext({
main: '.tinycanvas',
fill: '.s_grid_con'
fill: '.g_col'
})
}
bindHandlers();

42
app/assets/stylesheets/desktopmain.css
View File

@ -26,7 +26,7 @@ time, mark, audio, video {
#container input, #container textarea, #container select, #container input:focus, #container textarea:focus {
border-radius: 0;
box-shadow: none;
font: inherit;
font-family: inherit;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
@ -129,7 +129,10 @@ a:focus { outline: none; }
border: none;
}
.ini_input:focus { outline: none; }
#search_app { position: relative; background-color: #fff; }
#search_app {
position: relative;
background-color: #fff;
}
#search_app .form {
position: absolute;
left: 0;
@ -139,6 +142,7 @@ a:focus { outline: none; }
height: 28px;
line-height: 28px;
background: none;
border: 0;
}
#search_app .submit {
position: absolute;
@ -344,6 +348,7 @@ a:focus { outline: none; }
font-size: 15px;
line-height: 36px;
text-align: center;
border: 0;
}
/* theme color opacity */
@ -452,7 +457,7 @@ a:focus { outline: none; }
height: 100%;
left: 0;
top: 0;
z-index: 9;
z-index: 10;
}
#orbitdiag .tile { background-color: #000; }
.diag_holder { background-color: #000; }
@ -535,7 +540,7 @@ a:focus { outline: none; }
.s_form input[type=text], .s_form input[type=password], .s_form textarea{
outline: solid 3px #f6f6f6;
border: solid 1px #eee;
font-size: 18px;
font-size: 15px;
font-family: Arial !important;
margin: 0;
padding: 6px;
@ -578,14 +583,14 @@ a:focus { outline: none; }
height: 30px;
line-height: 30px;
right: 5px;
top: 4px;
top: 5px;
display: block;
background-color: #fff;
}
.s_form.s_grid_con { width: 416px; }
.s_form .s_grid_row { width: 410px; }
.s_form .s_grid_row .s_grid:first-child { margin-left: 0; }
.s_form input[type=text].s_grid, .s_form input[type=passowrd].s_grid, .s_form textarea.s_grid, .s_form label.s_grid { float: none; display: inline-block; margin-left: 10px; }
.s_form input[type=text].s_grid, .s_form input[type=passowrd].s_grid, .s_form textarea.s_grid, .s_form label.s_grid, .s_form select.s_grid { /*float: none; display: inline-block;*/ margin-left: 10px; }
.s_form input[type=text].s_grid_1, .s_form input[type=passowrd].s_grid_1, .s_form textarea.s_grid_1 { width: 46px; }
.s_form input[type=text].s_grid_2, .s_form input[type=passowrd].s_grid_2, .s_form textarea.s_grid_2 { width: 116px; }
.s_form input[type=text].s_grid_3, .s_form input[type=passowrd].s_grid_3, .s_form textarea.s_grid_3 { width: 186px; }
@ -598,7 +603,30 @@ a:focus { outline: none; }
.s_form select.s_grid_4 { width: 270px; }
.s_form select.s_grid_5 { width: 340px; }
.s_form select.s_grid_6 { width: 410px; }
.s_form label.s_grid { line-height: 34px; }
.s_form select.s_grid {
height: 26px;
margin-top: 4px;
margin-bottom: 4px;
}
.s_form textarea.full_height {
height: 436px;
}
.s_form .s_table {
width: 100%;
}
.s_form .s_table th, .s_form .s_table td {
padding: 6px 0;
}
.s_form .s_table th {
text-align: left;
}
.s_form .s_table td {
vertical-align: middle;
}
.s_form .s_table thead th {
border-bottom: solid 1px #eee;
}
#group_wrapper {}

39
app/views/desktop/journal_lists/index.html.erb
View File

@ -1,27 +1,22 @@
<h1>journal_title -- journal_level</h1>
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview">
<div class="s_grid_con s_form">
<% @journal_lists.each_with_index do |journal_list,i| %>
<% if ( i % 5 ) == 0 %>
<div class="s_grid_con s_form">
<ul>
<div class="tinycanvas">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview">
<% @journal_lists.each_with_index do |journal_list,i| %>
<% if ( i % 8 ) == 0 %>
<div class="g_col w4">
<ul>
<% end %>
<li class="s_grid_row">
<% title, level = journal_list %>
<%= title %> -- <%= level.join(",") %>
</li>
<% if ( i % 8 ) == 7 %>
</ul>
</div>
<% end %>
<% end %>
<li class="s_grid_row">
<% title, level = journal_list %>
<%= title %> -- <%= level.join(",") %>
</li>
<% if ( i % 5 ) == 4 %>
</ul>
</div>
<% end %>
<% end %>
</div>
</div>
</div>

79
app/views/desktop/journal_pages/_form.html.erb
View File

@ -1,9 +1,9 @@
<div class="toolbar hh2">
<div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
<%= f.submit "Save", name: "commit", value: "Save", class: "ini_input hp hh2 thmc2 thmtxt" %>
<!-- class: bt-cancle can't be remove -->
<% if not @writing_journal.new_record? %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
<% end %>
</div>
<div class="hh2 hp sdm">
@ -11,23 +11,19 @@
<div class="admbg sdm_o">
<!--<ul>
<li><a class="hp hh2 admtxt" href="">2012</a></li>
<li><a class="hp hh2 admtxt" href="">2011</a></li>
<li><a class="hp hh2 admtxt" href="">2010</a></li>
<li><a class="hp hh2 admtxt" href="">2009</a></li>
<li><a class="hp hh2 admtxt" href="">2008</a></li>
</ul>
-->
</div>
</div>
<div class="hh2 hp sdm">
<!--<div class="hh2 hp sdm">
<div class="sdm_t hh2">Language</div>
<div class="admbg sdm_o">
<ul>
<!--<li><a class="hp hh2 admtxt" href="">English</a></li>
<li><a class="hp hh2 admtxt" href="">Chinese</a></li>-->
<li><a class="hp hh2 admtxt" href="">English</a></li>
<li><a class="hp hh2 admtxt" href="">Chinese</a></li>
</ul>
</div>
</div>
</div>-->
<div class="hh2 hp sdm">
<div class="sdm_t hh2">Share</div>
<div class="admbg sdm_o">
@ -74,15 +70,6 @@
<!--<label for="">Journal Level</label>
<ul>
<li><input type="checkbox"><label for="">SCI</label></li>
<li><input type="checkbox"><label for="">SCIE</label></li>
<li><input type="checkbox"><label for="">SSCI</label></li>
<li><input type="checkbox"><label for="">AH & HCI</label></li>
<li><input type="checkbox"><label for="">EI</label></li>
<li><input type="checkbox"><label for="">CSCI</label></li>
<li><input type="checkbox"><label for="">CSSCI</label></li>
<li><input type="checkbox"><label for="">TSCI</label></li>
<li><input type="checkbox"><label for="">TSSCI</label></li>
<li><input type="checkbox"><label for="">THCI</label></li>
</ul>-->
</div>
</li>
@ -138,28 +125,21 @@
%>
</select>
</li>
<ul>
<li class="s_grid_row">
<%= label_tag("", "Date of Publication", class: "s_grid_4 s_grid") %>
</li>
<li class="s_grid_row">
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
</li>
</ul>
<li class="s_grid_row">
<%= label_tag("", "Date of Publication", class: "s_grid_3 s_grid") %>
<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
</li>
<li class="s_grid_row">
<%= f.text_field :keywords, size: "20", value: @writing_journal.keywords ||= "Keywords", class: "s_grid_6 s_grid"%>
</li>
<li class="s_grid_row">
<div><%= f.label :year ,:class => "s_grid_2 s_grid" %></div>
<div><%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %></div>
<%= f.label :year ,:class => "s_grid_2 s_grid" %>
<%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
</li>
<li class="s_grid_row">
<div><%= f.label :language ,:class => "s_grid_2 s_grid" %></div>
<%= f.label :language ,:class => "s_grid_2 s_grid" %>
<select name="writing_journal[language][]" id="" class="s_grid s_grid_4">
<%= options_for_select(
[["Chinese", "Chinese"],
@ -174,33 +154,32 @@
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<select name="" id="" class="s_grid s_grid_2">
<option value="">Status</option>
<option value="">Published</option>
<option value="">Pending</option>
<option value="">Writing</option>
</select>
<select name="" id="" class="s_grid s_grid_3">
<option value="">Status</option>
<option value="">Published</option>
<option value="">Pending</option>
<option value="">Writing</option>
</select>
</li>
</ul>
</div>
<div class="s_grid_con s_form">
<span class="icon-plus input_append"></span>
<ul>
<li class="s_grid_row">
<table>
<table class="s_table">
<thead>
<tr>
<th class="s_grid_2 s_grid">File</th>
<th class="s_grid_2 s_grid">File Name</th>
<th><span id='add_plugin_file' class="icon-plus input_append"></span></th>
<th class="s_grid_2">File</th>
<th class="s_grid_3">File Name</th>
<th class="s_grid_1">Action</th>
</tr>
</thead>
<tfoot>
<tr>
<td>
<div id='add_plugin_file' class="info_input plugin_files_block">
<td colspan="3">
<div id='add_plugin_file' class="info_input plugin_files_block s_action">
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
<a class="add"><span><i class="icon-plus icon-white"></i> add </span></a>
<a class="add setting_btn thmc1 thmtxt w1 hh2 hp" href=""><i class="icon-plus icon-white"></i> add</a>
</div>
</td>
</tr>
@ -216,15 +195,16 @@
</li>
</div>
<div class="s_grid_con s_form">
<ul>
<li class="s_grid_row">
<%= f.text_area :note, size: "20x2", placeholder: "Note", class: "s_grid_6 s_grid"%>
<%= f.text_area :note, size: "20x22", placeholder: "Note", class: "s_grid_6 s_grid full_height"%>
</li>
</ul>
</div>
<div class="s_grid_con s_form">
<ul>
<li class="s_grid_row">
<%= f.text_area :abstract, size: "20x26", placeholder: "Abstract", class: "s_grid_6 s_grid"%>
<%= f.text_area :abstract, size: "20x22", placeholder: "Abstract", class: "s_grid_6 s_grid full_height"%>
</li>
</ul>
</div>
@ -248,6 +228,7 @@
newfield.find('.action a.delete').click(function(){
newfield.remove();
});
return false;
});
$('.action a.remove_existing_record').click(function(){

4
app/views/desktop/journal_pages/_form_file.html.erb
View File

@ -1,12 +1,12 @@
<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class="list_item">
<td>
<div>
<%= f.file_field :file, class: "s_grid_1 s_grid" %>
<%= f.file_field :file, class: "s_grid_2 s_grid" %>
<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn s_grid_1 s_grid', :target => '_blank', :title => t(:view)} ) : '' %>
</div>
</td>
<td>
<%= f.text_field :title, :class=>'s_grid_1 s_grid' %>
<%= f.text_field :title, :class=>'s_grid_3 s_grid' %>
</td>
<td>

24
app/views/devise/registrations/edit.html.erb
View File

@ -1,14 +1,18 @@
<div class="vp">
<div class="s_title hh3">Password Managment</div>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<ul class="s_form">
<li><%= f.label :current_password %>
<%= f.password_field :current_password %></li>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<div><%= f.submit "Update" %></div>
<li><%= f.label :password %>
<%= f.password_field :password %></li>
<div><%= f.label :current_password %>
<%= f.password_field :current_password %></div>
<li><%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %></li>
</ul>
<div class="s_action"><%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh2 hp" %></div>
<div><%= f.label :password %>
<%= f.password_field :password %></div>
<% end %>
</div>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>
<% end %>