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

Merge branch 'desktop_devin' into desktop_harry

This commit is contained in:
Harry Bomrah 2012-05-03 21:41:20 +08:00
parent 49ab5bd858 3ad11f2098
commit 4dc82e91a0
4 changed files with 174 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/orbitdesktop.js
View File

@ -1029,7 +1029,21 @@ var orbitDesktop = function(dom){
var addpaper = function(){ // to open add pages in journal papers page var addpaper = function(){ // to open add pages in journal papers page
var bindHandlers = function(){ // to bind handlers for add page var bindHandlers = function(){ // to bind handlers for add page
o.simple_drop_down();
// fill width for tiny scroll bar
var e = $('.g_col'),
count = e.length,
baseWidth = e.eq(1).outerWidth(true);
e.parents('.overview').width( baseWidth * count );
$('.tinycanvas')
.tinyscrollbar({ axis: 'x'})
.find('.scrollbar')
.delay(1500)
.addClass('op00', 500);
} }
$("div#settings div#panel_r").load("/desktop/journal_p_add",function(){ $("div#settings div#panel_r").load("/desktop/journal_p_add",function(){
bindHandlers(); bindHandlers();

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

@ -455,7 +455,7 @@ a:focus { outline: none; }
} }
.diag_btn:hover { outline: solid 2px #fff; } .diag_btn:hover { outline: solid 2px #fff; }
.s_form { font-size: 15px; } .s_form { font-size: 15px; }
.s_form li { overflow: hidden; padding: 6px; margin-bottom: 12px; } .s_form li { overflow: hidden; padding: 6px; margin-bottom: 12px; position: relative; }
.s_form label { .s_form label {
font-size: 13px; font-size: 13px;
display: inline-block; display: inline-block;
@ -464,7 +464,7 @@ a:focus { outline: none; }
margin-right: 24px; margin-right: 24px;
color: #777; color: #777;
} }
.s_form input[type=text], .s_form input[type=password]{ .s_form input[type=text], .s_form input[type=password], .s_form textarea{
outline: solid 3px #f6f6f6; outline: solid 3px #f6f6f6;
border: solid 1px #eee; border: solid 1px #eee;
font-size: 18px; font-size: 18px;
@ -475,10 +475,45 @@ a:focus { outline: none; }
-webkit-transition: all 0.3s ease; -webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease; -moz-transition: all 0.3s ease;
} }
.s_form input[type=text]:focus, .s_form input[type=password]:focus { .s_form select { font-family: Arial !important; }
.s_form input[type=file] { margin: 0px; vertical-align: baseline; }
.s_form input[type=text]:focus, .s_form input[type=password]:focus, .s_form textarea:focus {
background-color: #333; background-color: #333;
color: #fff; color: #fff;
} }
.s_form textarea { resize: none; }
.check_box_g {
padding: 4px 8px;
outline: solid 1px #eee;
}
.check_box_g > label {
font-size: 15px;
display: block;
padding: 4px 0;
}
.check_box_g li {
margin: 0 6px 6px 0;
padding: 0;
}
.check_box_g li, .check_box_g li > * {
display: inline-block;
vertical-align: middle;
}
.check_box_g label {
width: auto;
margin: 0;
}
.check_box_g li label { padding-left: 4px; }
.s_form .input_append {
position: absolute;
width: 30px;
height: 30px;
line-height: 30px;
right: 5px;
top: 3px;
display: block;
background-color: #fff;
}
#group_wrapper {} #group_wrapper {}
.grp { height:528px; } .grp { height:528px; }
@ -533,7 +568,7 @@ a:focus { outline: none; }
} }
/* Journal Papers */ /* Journal Papers */
#paper_list { height: 456px; } #paper_list, #paper_add { height: 456px; }
#paper_list .g_col { #paper_list .g_col {
width: 300px; width: 300px;
height: 456px; height: 456px;
@ -559,4 +594,16 @@ a:focus { outline: none; }
.list_item_action .item_check_status { outline: solid 1px #999; } .list_item_action .item_check_status { outline: solid 1px #999; }
.list_item_action .icon-star-empty { color: #999; } .list_item_action .icon-star-empty { color: #999; }
.list_item_action .icon-star { color: #faa732; } .list_item_action .icon-star { color: #faa732; }
.item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; } .item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; }
/* Journal Paper Add */
#paper_add .g_col {
width: 360px;
height: 456px;
margin-left: 12px;
padding-left: 12px;
border-left: solid 1px #eee;
}
#paper_add .g_col:first-child { margin-left: 0; padding-left: 0; border: none; }
#paper_add .s_form > ul > li { margin-bottom: 6px; padding: 2px 6px; }
#paper_add .f_w { width: 336px; }

106
app/views/desktop/journal_pages/add.html.erb
View File

@ -1 +1,105 @@
This is add page <div class="toolbar hh2">
<div class="hh2 hp sdm">
<div class="sdm_t hh2">Entry Year</div>
<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="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>
</ul>
</div>
</div>
<div class="hh2 hp sdm">
<div class="sdm_t hh2">Share</div>
<div class="admbg sdm_o">
<ul>
<li><a class="hp hh2 admtxt" href="">Full</a></li>
<li><a class="hp hh2 admtxt" href="">Abstract</a></li>
<li><a class="hp hh2 admtxt" href="">Friends</a></li>
<li><a class="hp hh2 admtxt" href="">Private</a></li>
<li><a class="hp hh2 admtxt" href="">Group</a></li>
</ul>
</div>
</div>
<div class="hh2 hp sdm">
<div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="paper_add" class="tinycanvas vp">
<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="g_col s_form">
<ul>
<li><textarea class="f_w" name="" id="">Paper Title</textarea></li>
<li><input class="f_w" type="text" value="Journal Title"><span class="icon-plus input_append"></span></li>
<li>
<div class="check_box_g">
<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>
<li><label for="">ISSN(ISBN)</label><input type="text" value="829872987"></li>
<li><label for="">ISI No.</label><input type="text" value="829872987"></li>
<li><label for="">Volume No.</label><input type="text" value="829872987"></li>
<li><label for="">Issue No.</label><input type="text" value="829872987"></li>
<li><label for="">Pages</label><div class="n_slider" style="display: inline-block;"><input type="range" style="width: 80px;"></div><span class="n_slider_sum"><label for="" style="width:60px; margin: 0; text-align: center;">Total</label><input type="text" style="width: 60px;"></span></li>
<li><label for="">Reference URL</label><input type="text" value="www.sample.com"></li>
</ul>
</div>
<div class="g_col s_form">
<ul>
<li><textarea class="f_w" name="" id="">Author</textarea><span class="icon-plus input_append"></span></li>
<li>
<select name="" id="" style="width:220px;">
<option value="">Author Type</option>
<option value="">First Author</option>
<option value="">Corresponding Author</option>
<option value="">Second Author</option>
<option value="">Third Author</option>
<option value="">Fourth Author</option>
</select>
<select name="" id="" style="width: 120px;">
<option value="">Status</option>
<option value="">Published</option>
<option value="">Pending</option>
<option value="">Writing</option>
</select>
</li>
<li><label for="">Date of Publication</label><input type="text" value="2012 / 05 / 01"></li>
<li><textarea name="" id="" rows="10" class="f_w"></textarea></li>
<li><input class="f_w" type="text" value="Associated Project"><span class="icon-plus input_append"></span></li>
<li><label for="">Abstract</label><input type="file"></li>
<li><label for="">Full Text</label><input type="file"></li>
</ul>
</div>
<div class="g_col s_form">
<ul>
<li><textarea name="" id="" rows="26" class="f_w">Abstract</textarea></li>
</ul>
</div>
</div>
</div>
</div>

3
app/views/desktop/journal_pages/list.html.erb
View File

@ -61,6 +61,9 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="hh2 hp sdm">
<div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
</div>
</div> </div>
<div id="paper_list" class="tinycanvas vp"> <div id="paper_list" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div> <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>