diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 8ad2694d..6aba5d46 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -907,7 +907,21 @@ var orbitDesktop = function(dom){ var addpaper = function(){ // to open add pages in journal papers 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(){ bindHandlers(); diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 8bb89786..377d7f1d 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -455,7 +455,7 @@ a:focus { outline: none; } } .diag_btn:hover { outline: solid 2px #fff; } .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 { font-size: 13px; display: inline-block; @@ -464,7 +464,7 @@ a:focus { outline: none; } margin-right: 24px; 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; border: solid 1px #eee; font-size: 18px; @@ -475,10 +475,45 @@ a:focus { outline: none; } -webkit-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; 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 {} .grp { height:528px; } @@ -533,7 +568,7 @@ a:focus { outline: none; } } /* Journal Papers */ -#paper_list { height: 456px; } +#paper_list, #paper_add { height: 456px; } #paper_list .g_col { width: 300px; height: 456px; @@ -559,4 +594,16 @@ a:focus { outline: none; } .list_item_action .item_check_status { outline: solid 1px #999; } .list_item_action .icon-star-empty { color: #999; } .list_item_action .icon-star { color: #faa732; } -.item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; } \ No newline at end of file +.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; } \ No newline at end of file diff --git a/app/views/desktop/journal_pages/add.html.erb b/app/views/desktop/journal_pages/add.html.erb index 5870f615..f7ca7fc9 100644 --- a/app/views/desktop/journal_pages/add.html.erb +++ b/app/views/desktop/journal_pages/add.html.erb @@ -1 +1,105 @@ -This is add page \ No newline at end of file +
+
+
Entry Year
+
+ +
+
+
+
Language
+
+ +
+
+
+
Share
+
+ +
+
+
+
+
+
+
+
+
+
+
+
    +
    • +
    • +
  • +
    + +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
    +
    • +
  • + + +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
    +
    • +
+
+
+
+
\ No newline at end of file diff --git a/app/views/desktop/journal_pages/list.html.erb b/app/views/desktop/journal_pages/list.html.erb index 432784e1..9bc11b1d 100644 --- a/app/views/desktop/journal_pages/list.html.erb +++ b/app/views/desktop/journal_pages/list.html.erb @@ -2,7 +2,7 @@
-