diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 1db9e4b3..3e9007fe 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -605,22 +605,24 @@ var orbitDesktop = function(dom){
});
// single select
$('.ssl .ssl_item').each(function(){
+ var $des = $(this).find('.ssl_des');
+
$(this).on({
click: function(){
- $(this).switchClass('','thmc1 active',300);
- $(this).siblings('.thmc1').switchClass('thmc1 active','',100);
+ $(this).switchClass('','thmc1 active',0);
+ $(this).siblings('.thmc1').switchClass('thmc1 active','',0);
- if( $(this).find('.ssl_des') ){
+ if( $des.length > 0 ){
$(this).parents('.ssl').find('.ssl_des').removeClass('thmtxt');
- $(this).find('.ssl_des').addClass('thmtxt');
+ $des.addClass('thmtxt');
}
},
mouseenter: function(){
if( !$(this).hasClass('active') ){
$(this).addClass('thmc1');
- if( $(this).find('.ssl_des') ){
- $(this).find('.ssl_des').addClass('thmtxt');
+ if( $des.length > 0 ){
+ $des.addClass('thmtxt');
}
}
},
@@ -628,8 +630,8 @@ var orbitDesktop = function(dom){
if( !$(this).hasClass('active') ){
$(this).removeClass('thmc1');
- if( $(this).find('.ssl_des') ){
- $(this).find('.ssl_des').removeClass('thmtxt');
+ if( $des.length > 0 ){
+ $des.removeClass('thmtxt');
}
}
}
@@ -1008,7 +1010,7 @@ var orbitDesktop = function(dom){
li;
$.each(journalData,function(i,journal){
$.each(journal.papers,function(j,paper){
- li = $(''+paper.title+'
'+paper.abstract+paper.abstract+'
');
+ li = $(''+paper.title+'
'+paper.abstract+paper.abstract+'
');
column.find("ul").append(li);
$("#journal_p div#paper_list div.overview").append(column);
column = $('');
@@ -1032,7 +1034,7 @@ var orbitDesktop = function(dom){
o.simple_drop_down();
// fill width for tiny scroll bar
- var e = $('.g_col'),
+ var e = $('.s_grid_con'),
count = e.length,
baseWidth = e.eq(1).outerWidth(true);
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index 377d7f1d..d9823f5e 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -204,6 +204,7 @@ a:focus { outline: none; }
/*.section_slc { width: 252px; }*/
.admbg { background-color: #fff; }
+.admbg2 { background-color: #ddd; }
.admtxt { color: #666; }
.admtxt:hover { color: #666; }
.hfn {
@@ -276,8 +277,17 @@ a:focus { outline: none; }
position: relative;
z-index: 9;
}
-.toolbar .sdm { display: inline-block; }
+.toolbar .sdm, .toolbar .fn_g { display: inline-block; }
.toolbar .sdm_o { top: 36px; background-color: #f0f0f0; }
+.toolbar button {
+ border: none;
+ outline: none;
+ padding: 0 16px;
+ margin: 0;
+ font-family: inherit;
+ font-size: 15px;
+ vertical-align: top;
+}
/* Setting Page */
@@ -454,8 +464,27 @@ a:focus { outline: none; }
margin: 0 6px;
}
.diag_btn:hover { outline: solid 2px #fff; }
+
+/* tinygrid */
+.s_grid_con { width: 410px; }
+.s_grid_row { overflow: hidden; margin-bottom: 12px; }
+.s_grid_row .s_grid:first-child { margin-left: 0; }
+.s_grid {
+ float: left;
+ margin: 0 0 0 10px;
+}
+.s_grid_con .s_grid_1 { width: 60px; }
+.s_grid_con .s_grid_2 { width: 130px; }
+.s_grid_con .s_grid_3 { width: 200px; }
+.s_grid_con .s_grid_4 { width: 270px; }
+.s_grid_con .s_grid_5 { width: 340px; }
+.s_grid_con .s_grid_6 { width: 410px; }
+
+/* simple form */
+
.s_form { font-size: 15px; }
.s_form li { overflow: hidden; padding: 6px; margin-bottom: 12px; position: relative; }
+.s_form .s_grid_row { padding: 3px; margin-bottom: 6px; }
.s_form label {
font-size: 13px;
display: inline-block;
@@ -475,7 +504,7 @@ a:focus { outline: none; }
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
}
-.s_form select { font-family: Arial !important; }
+.s_form select { font-family: Arial !important; padding: 6px; height: auto; }
.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;
@@ -503,18 +532,35 @@ a:focus { outline: none; }
width: auto;
margin: 0;
}
-.check_box_g li label { padding-left: 4px; }
+.check_box_g li label { padding-left: 4px; font-family: Arial; }
.s_form .input_append {
position: absolute;
width: 30px;
height: 30px;
line-height: 30px;
right: 5px;
- top: 3px;
+ top: 4px;
display: block;
background-color: #fff;
}
+.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_1, .s_form input[type=passowrd].s_grid_1, .s_form textarea.s_grid_1 { width: 40px; }
+.s_form input[type=text].s_grid_2, .s_form input[type=passowrd].s_grid_2, .s_form textarea.s_grid_2 { width: 110px; }
+.s_form input[type=text].s_grid_3, .s_form input[type=passowrd].s_grid_3, .s_form textarea.s_grid_3 { width: 180px; }
+.s_form input[type=text].s_grid_4, .s_form input[type=passowrd].s_grid_4, .s_form textarea.s_grid_4 { width: 250px; }
+.s_form input[type=text].s_grid_5, .s_form input[type=passowrd].s_grid_5, .s_form textarea.s_grid_5 { width: 320px; }
+.s_form input[type=text].s_grid_6, .s_form input[type=passowrd].s_grid_6, .s_form textarea.s_grid_6 { width: 390px; }
+.s_form select.s_grid_1 { width: 57px; }
+.s_form select.s_grid_2 { width: 127px; }
+.s_form select.s_grid_3 { width: 197px; }
+.s_form select.s_grid_4 { width: 267px; }
+.s_form select.s_grid_5 { width: 337px; }
+.s_form select.s_grid_6 { width: 407px; }
+
+
+
#group_wrapper {}
.grp { height:528px; }
.g_col {
@@ -527,8 +573,13 @@ a:focus { outline: none; }
/* list item */
.list_t_item { padding: 2px; overflow: hidden; }
-.list_t_title { font-size: 15px; margin-bottom: 10px; color: #333; }
-.list_t_des { font-size: 13px; color: #777; font-family: Arial; margin-bottom: 10px; }
+.list_t_title {
+ font-size: 15px;
+ font-family: Arial;
+ margin-bottom: 10px;
+ color: #333;
+}
+.list_t_des { font-size: 13px; color: #999; font-family: Arial; margin-bottom: 10px; }
/* Connection Page */
#connection_setting { height: 492px; }
@@ -557,6 +608,10 @@ a:focus { outline: none; }
color: #ccc;
font-family: Arial;
font-weight: bold;
+ -webkit-text-size-adjust: none;
+ transition: background-color 0.5s ease;
+ -moz-transition: background-color 0.5s ease;
+ -webkit-transition: background-color 0.5s ease;
}
#connection_setting .c_status_on { background-color: #51A351; color: #fff; }
#connection_setting .c_info {
@@ -597,13 +652,13 @@ a:focus { outline: none; }
.item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; }
/* Journal Paper Add */
-#paper_add .g_col {
- width: 360px;
+#paper_add .s_grid_con {
+ float: left;
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; }
\ No newline at end of file
+#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; }
+#paper_add .f_w { width: 336px; }
+#paper_add label { margin-right: 0; }
\ No newline at end of file
diff --git a/app/assets/stylesheets/desktopmedia.css b/app/assets/stylesheets/desktopmedia.css
index 2e5d6275..e8fc7bfe 100644
--- a/app/assets/stylesheets/desktopmedia.css
+++ b/app/assets/stylesheets/desktopmedia.css
@@ -1,4 +1,4 @@
-@media only screen and (min-width: 1300px){
+@media only screen and (min-width: 1240px){
#panel_r.pw { width: 800px; }
diff --git a/app/views/desktop/journal_pages/add.html.erb b/app/views/desktop/journal_pages/add.html.erb
index f7ca7fc9..324432b6 100644
--- a/app/views/desktop/journal_pages/add.html.erb
+++ b/app/views/desktop/journal_pages/add.html.erb
@@ -1,4 +1,8 @@
