Merge branch 'desktop_design_devin' into desktop_work1
Conflicts: app/assets/javascripts/orbitdesktop.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
This commit is contained in:
commit
96b6f7e3fd
|
|
@ -17,4 +17,7 @@ uploads/**/*
|
|||
|
||||
*.swp
|
||||
*.pid
|
||||
*.lck
|
||||
*.lck
|
||||
|
||||
.sass-cache/*
|
||||
*.supported
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 824 B |
|
|
@ -867,7 +867,7 @@ var orbitDesktop = function(dom){
|
|||
if(tile.data_category == "app")
|
||||
$li = $('<li data-id="'+tile.id+'" class="app" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-title="'+tile.title+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'"><span class="tile '+tilecolor+' '+op+'"></span><a href="'+tile.data_content+'" class="appicon" onclick="return false;" data-url="'+tile.link+'"><img src="'+o.iconPath+tile.data_content+'.png" alt="" ></a><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
else
|
||||
$li = $('<li data-id="'+tile.id+'" class="widget '+f+'" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder"><div class="thmtxt all-loading"><i class="icon-spinner icon-spin"></i> Loading </div></div><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
$li = $('<li data-id="'+tile.id+'" class="widget '+f+'" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder"><div class="thmtxt o-loading"><i class="icon-spinning icon-spinner"></i> Loading</div></div><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
|
||||
|
||||
|
||||
|
|
@ -1667,20 +1667,18 @@ var orbitDesktop = function(dom){
|
|||
};
|
||||
this.simple_drop_down = function(){
|
||||
// simple dropdown menu
|
||||
if( !$('.sdm').children('.sdm_o').length > 0 ){
|
||||
return;
|
||||
} else {
|
||||
$('.sdm').hover(function(){
|
||||
$(this).stop(1,1).toggleClass('thmc2 thmtxt');
|
||||
}, function(){
|
||||
$(this).stop(1,1).toggleClass('thmc2 thmtxt');
|
||||
});
|
||||
$('.sdm').find('a').hover(function(){
|
||||
$(this).stop(1,1).toggleClass('thmc2 thmtxt');
|
||||
}, function(){
|
||||
$(this).stop(1,1).toggleClass('thmc2 thmtxt');
|
||||
var $sdm = $('.sdm');
|
||||
if( $sdm.find('.sdm_o') ){
|
||||
$sdm.find('a').andSelf().on({
|
||||
mouseenter: function(){
|
||||
$(this).addClass('thmc2 thmtxt');
|
||||
},
|
||||
mouseleave: function(){
|
||||
$(this).removeClass('thmc2 thmtxt');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
this.simple_tab = function(){
|
||||
// tab
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ var orbitDesktopAPI = function(){
|
|||
return;
|
||||
}
|
||||
}
|
||||
var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'"><div id="content"><div id="header" class="hh3"><div class="dtitle w2 hh3 hp" style="text-transform:capitalize;"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh3 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe><div class="clear"></div></div></div></div>');
|
||||
var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'"><div id="content"><div id="header" class="hh3"><div class="dtitle hh3 hp" style="text-transform:capitalize;"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh3 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe><div class="clear"></div></div></div></div>');
|
||||
$(o.contentHolder).append(whtml);
|
||||
var parentwindow = $(o.contentHolder).find("div#app_frame_"+o.windowcounter);
|
||||
var app_holder_height = parentwindow.height() - 72;
|
||||
|
|
|
|||
|
|
@ -92,20 +92,17 @@
|
|||
z-index: 9;
|
||||
left: 0;
|
||||
top: 60px;
|
||||
font-size: 15px; }
|
||||
|
||||
.sdm_o li {
|
||||
border-top: solid 1px #f2f2f2; }
|
||||
|
||||
.sdm_o li:first-child {
|
||||
border: none; }
|
||||
|
||||
.sdm_o a {
|
||||
display: block; }
|
||||
|
||||
.sdm_o .admtxt {
|
||||
display: block;
|
||||
line-height: 36px; }
|
||||
font-size: 15px;
|
||||
width: 120px; }
|
||||
.sdm_o li {
|
||||
border-top: solid 1px #f2f2f2; }
|
||||
.sdm_o li:first-child {
|
||||
border: none; }
|
||||
.sdm_o a {
|
||||
display: block; }
|
||||
.sdm_o .admtxt {
|
||||
display: block;
|
||||
line-height: 36px; }
|
||||
|
||||
/* simple dropdown menu with indicator */
|
||||
.sdm_mdr .sdm_t {
|
||||
|
|
@ -119,15 +116,12 @@
|
|||
.s_menu {
|
||||
font-size: 15px;
|
||||
line-height: 36px; }
|
||||
|
||||
.s_menu li {
|
||||
border-top: solid 1px #dddddd; }
|
||||
|
||||
.s_menu li:first-child {
|
||||
border: none; }
|
||||
|
||||
.s_menu a {
|
||||
display: block; }
|
||||
.s_menu li {
|
||||
border-top: solid 1px #dddddd; }
|
||||
.s_menu li:first-child {
|
||||
border: none; }
|
||||
.s_menu a {
|
||||
display: block; }
|
||||
|
||||
/* simple tabs */
|
||||
.s_tab {
|
||||
|
|
@ -197,7 +191,8 @@
|
|||
.s_form input[type=text]:focus,
|
||||
.s_form input[type=password]:focus,
|
||||
.s_form textarea:focus {
|
||||
background-color: #f7f7f7; }
|
||||
background-color: #f7f7f7;
|
||||
border-color: #c4c4c4; }
|
||||
.s_form textarea {
|
||||
resize: none; }
|
||||
.s_form textarea.full_height {
|
||||
|
|
@ -250,27 +245,23 @@
|
|||
line-height: 36px;
|
||||
position: relative;
|
||||
z-index: 9; }
|
||||
|
||||
.toolbar .sdm, .toolbar .fn_g {
|
||||
display: inline-block;
|
||||
vertical-align: top; }
|
||||
|
||||
.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; }
|
||||
|
||||
.toolbar .fn_btn {
|
||||
display: inline-block;
|
||||
vertical-align: top; }
|
||||
.toolbar .sdm, .toolbar .fn_g {
|
||||
display: inline-block;
|
||||
vertical-align: top; }
|
||||
.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; }
|
||||
.toolbar .fn_btn {
|
||||
display: inline-block;
|
||||
vertical-align: top; }
|
||||
|
||||
/* tiny scrollbar */
|
||||
.tinycanvas {
|
||||
|
|
@ -368,10 +359,7 @@
|
|||
.tinycanvas:hover .scrollbar {
|
||||
visibility: visible;
|
||||
opacity: 1; }
|
||||
|
||||
.toolbar + .tinycanvas,
|
||||
.s_tab + .tinycanvas {
|
||||
height: 480px; }
|
||||
|
||||
#panel_r .tinycanvas {
|
||||
padding: 12px 0; }
|
||||
.toolbar + .tinycanvas, .s_tab + .tinycanvas {
|
||||
height: 480px; }
|
||||
#panel_r .tinycanvas {
|
||||
padding: 12px 0; }
|
||||
|
|
|
|||
|
|
@ -58,19 +58,21 @@
|
|||
left: 0;
|
||||
top: 60px;
|
||||
font-size: 15px;
|
||||
width: 120px;
|
||||
|
||||
li {
|
||||
border-top: solid 1px #f2f2f2;
|
||||
}
|
||||
li:first-child {
|
||||
border: none;
|
||||
}
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
.admtxt {
|
||||
display: block;
|
||||
line-height: 36px;
|
||||
}
|
||||
.sdm_o li {
|
||||
border-top: solid 1px #f2f2f2;
|
||||
}
|
||||
.sdm_o li:first-child {
|
||||
border: none;
|
||||
}
|
||||
.sdm_o a {
|
||||
display: block;
|
||||
}
|
||||
.sdm_o .admtxt {
|
||||
display: block;
|
||||
line-height: 36px;
|
||||
}
|
||||
|
||||
/* simple dropdown menu with indicator */
|
||||
|
|
@ -86,15 +88,16 @@
|
|||
.s_menu {
|
||||
font-size: 15px;
|
||||
line-height: 36px;
|
||||
}
|
||||
.s_menu li {
|
||||
border-top: solid 1px #ddd;
|
||||
}
|
||||
.s_menu li:first-child {
|
||||
border: none;
|
||||
}
|
||||
.s_menu a {
|
||||
display: block;
|
||||
|
||||
li {
|
||||
border-top: solid 1px #ddd;
|
||||
}
|
||||
li:first-child {
|
||||
border: none;
|
||||
}
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
/* simple tabs */
|
||||
|
|
@ -165,6 +168,7 @@
|
|||
|
||||
&:focus {
|
||||
background-color: lighten($gray, 10%);
|
||||
border-color: darken($gray, 10%);
|
||||
}
|
||||
}
|
||||
textarea {
|
||||
|
|
@ -228,27 +232,28 @@
|
|||
line-height: 36px;
|
||||
position: relative;
|
||||
z-index: 9;
|
||||
}
|
||||
.toolbar .sdm, .toolbar .fn_g {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
.toolbar .fn_btn {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
||||
.sdm, .fn_g {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
.sdm_o {
|
||||
top: 36px;
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
button {
|
||||
border: none;
|
||||
outline: none;
|
||||
padding: 0 16px;
|
||||
margin: 0;
|
||||
font-family: inherit;
|
||||
font-size: 15px;
|
||||
vertical-align: top;
|
||||
}
|
||||
.fn_btn {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
}
|
||||
|
||||
/* tiny scrollbar */
|
||||
|
|
@ -351,11 +356,11 @@
|
|||
visibility: visible;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
.toolbar + .tinycanvas,
|
||||
.s_tab + .tinycanvas {
|
||||
height: 480px;
|
||||
}
|
||||
#panel_r .tinycanvas {
|
||||
padding: 12px 0;
|
||||
.toolbar + &,
|
||||
.s_tab + & {
|
||||
height: 480px;
|
||||
}
|
||||
#panel_r & {
|
||||
padding: 12px 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -70,11 +70,14 @@ a:focus {
|
|||
.clear:after {
|
||||
display: table;
|
||||
width: 100%;
|
||||
content: ''; }
|
||||
content: '';
|
||||
clear: both; }
|
||||
|
||||
.o-loading {
|
||||
font-size: 13px;
|
||||
font-weight: normal; }
|
||||
.fullsize .o-loading {
|
||||
padding: 12px; }
|
||||
.o-loading i {
|
||||
font-size: 20px; }
|
||||
|
||||
|
|
@ -466,6 +469,8 @@ a:focus {
|
|||
margin: 0 12px 0 0;
|
||||
position: relative;
|
||||
z-index: 9; }
|
||||
.dtitle .sdm_o {
|
||||
width: auto; }
|
||||
|
||||
.tile {
|
||||
display: block;
|
||||
|
|
@ -507,7 +512,6 @@ a:focus {
|
|||
|
||||
.theme_preview {
|
||||
width: 528px;
|
||||
height: 150px;
|
||||
line-height: 36px;
|
||||
font-size: 15px; }
|
||||
|
||||
|
|
@ -518,6 +522,11 @@ a:focus {
|
|||
margin-right: 12px; }
|
||||
.theme_plate > div:first-child {
|
||||
margin-right: 48px; }
|
||||
.theme_plate .g_sep {
|
||||
margin-right: 0; }
|
||||
|
||||
#color_input th {
|
||||
vertical-align: bottom; }
|
||||
|
||||
.stock_wallpaper .ssl_item {
|
||||
margin-bottom: 6px; }
|
||||
|
|
@ -527,6 +536,11 @@ a:focus {
|
|||
font-weight: normal;
|
||||
line-height: 60px;
|
||||
text-align: left; }
|
||||
.s_title.size_large {
|
||||
font-size: 36px; }
|
||||
.s_title.size_small {
|
||||
font-size: 15px;
|
||||
line-height: 2em; }
|
||||
|
||||
.s_subtitle {
|
||||
font-size: 15px;
|
||||
|
|
@ -560,8 +574,18 @@ a:focus {
|
|||
max-width: 340px; }
|
||||
|
||||
.g_sep {
|
||||
width: 11px;
|
||||
border-left: solid 1px white; }
|
||||
width: 12px;
|
||||
border-left: solid 1px white;
|
||||
-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 */ }
|
||||
|
||||
.grp {
|
||||
height: 528px;
|
||||
|
|
@ -586,7 +610,6 @@ a:focus {
|
|||
|
||||
/* list item */
|
||||
.list_t_item {
|
||||
/*padding: 2px;*/
|
||||
overflow: hidden; }
|
||||
|
||||
.list_t_title {
|
||||
|
|
@ -607,118 +630,74 @@ a:focus {
|
|||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none; }
|
||||
|
||||
/* Connection Page */
|
||||
#connection_setting {
|
||||
height: 492px; }
|
||||
|
||||
#connection_setting .s_form {
|
||||
float: left;
|
||||
margin: 0 12px 0 0;
|
||||
padding-left: 24px;
|
||||
height: 100%;
|
||||
border-left: solid 1px #dddddd; }
|
||||
|
||||
#connection_setting .s_form:first-child {
|
||||
padding-left: 0;
|
||||
border: none; }
|
||||
|
||||
#connection_setting .s_form label {
|
||||
line-height: 30px; }
|
||||
|
||||
#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
|
||||
display: inline-block;
|
||||
vertical-align: middle; }
|
||||
|
||||
#connection_setting .s_form .c_name {
|
||||
padding: 0 12px;
|
||||
font-size: 18px; }
|
||||
|
||||
#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] {
|
||||
width: 202px; }
|
||||
|
||||
#connection_setting .setting_btn {
|
||||
margin-left: 12px; }
|
||||
|
||||
#connection_setting .setting_btn.disable {
|
||||
background-color: #ddd;
|
||||
cursor: default; }
|
||||
|
||||
#connection_setting .c_status {
|
||||
float: right;
|
||||
padding: 6px;
|
||||
background-color: #eee;
|
||||
color: #ccc;
|
||||
font-size: 9px;
|
||||
font-weight: normal;
|
||||
-webkit-text-size-adjust: none;
|
||||
-webkit-transition: background-color 0.5s ease;
|
||||
-moz-transition: background-color 0.5s ease;
|
||||
transition: background-color 0.5s ease; }
|
||||
|
||||
#connection_setting .c_status_on {
|
||||
background-color: #51A351;
|
||||
color: #fff; }
|
||||
|
||||
#connection_setting .c_info {
|
||||
padding: 7px 6px;
|
||||
background-color: #fcfcfc;
|
||||
cursor: default;
|
||||
font-size: 18px;
|
||||
font-weight: normal; }
|
||||
|
||||
/* 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; }
|
||||
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star-empty {
|
||||
color: #999;
|
||||
font-size: 20px; }
|
||||
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star {
|
||||
color: #faa732;
|
||||
font-size: 20px; }
|
||||
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check-empty {
|
||||
color: #999;
|
||||
font-size: 20px; }
|
||||
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check {
|
||||
color: #333;
|
||||
font-size: 20px; }
|
||||
|
||||
[page-name="journal_p_list"] .list_t_item.file_view {
|
||||
height: 148px; }
|
||||
|
||||
[page-name="journal_p_list"] .list_item_action a {
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
margin: 1px 1px 6px 1px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star-empty {
|
||||
color: #999;
|
||||
font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star {
|
||||
color: #faa732;
|
||||
font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check-empty {
|
||||
color: #999;
|
||||
font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check {
|
||||
color: #333;
|
||||
font-size: 20px; }
|
||||
[page-name="journal_p_list"] .file_view .list_t_des {
|
||||
overflow: hidden; }
|
||||
[page-name="journal_p_list"] .file_view .file {
|
||||
display: inline-block;
|
||||
width: 62px;
|
||||
float: left;
|
||||
width: 120px;
|
||||
height: 50px;
|
||||
text-align: center; }
|
||||
|
||||
[page-name="journal_p_list"] .file_view .file:hover {
|
||||
background-color: #ddd; }
|
||||
|
||||
[page-name="journal_p_list"] .file_view .file img {
|
||||
width: 24px;
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
margin-top: 4px; }
|
||||
|
||||
[page-name="journal_p_list"] .file_view .filetitle {
|
||||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none; }
|
||||
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: #f7f7f7; }
|
||||
[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 */ }
|
||||
|
||||
/* Journal Paper Add */
|
||||
#paper_add .s_grid_con {
|
||||
|
|
@ -727,27 +706,22 @@ a:focus {
|
|||
margin-left: 12px;
|
||||
padding-left: 12px;
|
||||
border-left: solid 1px #eeeeee; }
|
||||
|
||||
#paper_add .s_grid_con:first-child {
|
||||
margin-left: 0;
|
||||
padding-left: 0;
|
||||
border: none; }
|
||||
|
||||
#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; }
|
||||
|
||||
/* 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;
|
||||
|
|
@ -756,7 +730,6 @@ a:focus {
|
|||
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;
|
||||
|
|
@ -765,21 +738,17 @@ a:focus {
|
|||
/* Journal Co-Author */
|
||||
[page-name="journal_p_coauthor"] .list_t_item {
|
||||
height: 110px; }
|
||||
|
||||
[page-name="journal_p_coauthor"] .list_item_function a {
|
||||
display: inline-block;
|
||||
padding: 4px;
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none; }
|
||||
|
||||
[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;
|
||||
|
|
@ -788,7 +757,6 @@ a:focus {
|
|||
/* 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;
|
||||
|
|
@ -809,18 +777,16 @@ a:focus {
|
|||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 12; }
|
||||
|
||||
.app_frame .app_holder {
|
||||
background-color: #fff;
|
||||
position: absolute;
|
||||
width: 100%; }
|
||||
|
||||
.app_frame #header .icon-remove {
|
||||
display: block;
|
||||
float: right;
|
||||
line-height: 60px;
|
||||
font-size: 20px;
|
||||
cursor: pointer; }
|
||||
.app_frame .app_holder {
|
||||
background-color: #fff;
|
||||
position: absolute;
|
||||
width: 100%; }
|
||||
.app_frame #header .icon-remove {
|
||||
display: block;
|
||||
float: right;
|
||||
line-height: 60px;
|
||||
font-size: 20px;
|
||||
cursor: pointer; }
|
||||
|
||||
/*Tooltip popup */
|
||||
.desktop_toolpopup {
|
||||
|
|
|
|||
|
|
@ -66,11 +66,15 @@ a:focus { outline: none; }
|
|||
display: table;
|
||||
width: 100%;
|
||||
content: '';
|
||||
clear: both;
|
||||
}
|
||||
.o-loading {
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
|
||||
.fullsize & {
|
||||
padding: 12px;
|
||||
}
|
||||
i {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
|
@ -442,7 +446,11 @@ a:focus { outline: none; }
|
|||
margin: 0 12px 0 0;
|
||||
position: relative;
|
||||
z-index: 9;
|
||||
|
||||
.sdm_o {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
.tile {
|
||||
display: block;
|
||||
width: 100%;
|
||||
|
|
@ -450,7 +458,7 @@ a:focus { outline: none; }
|
|||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
.widget.gs_w {
|
||||
cursor: move;
|
||||
}
|
||||
|
|
@ -484,7 +492,6 @@ a:focus { outline: none; }
|
|||
}
|
||||
.theme_preview {
|
||||
width: 528px;
|
||||
height: 150px;
|
||||
line-height: 36px;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
|
@ -498,6 +505,12 @@ a:focus { outline: none; }
|
|||
> div:first-child {
|
||||
margin-right: 48px;
|
||||
}
|
||||
.g_sep {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
#color_input th {
|
||||
vertical-align: bottom
|
||||
}
|
||||
.stock_wallpaper {
|
||||
.ssl_item {
|
||||
|
|
@ -510,6 +523,14 @@ a:focus { outline: none; }
|
|||
font-weight: normal;
|
||||
line-height: 60px;
|
||||
text-align: left;
|
||||
|
||||
&.size_large {
|
||||
font-size: 36px;
|
||||
}
|
||||
&.size_small {
|
||||
font-size: 15px;
|
||||
line-height: 2em;
|
||||
}
|
||||
}
|
||||
.s_subtitle {
|
||||
font-size: 15px;
|
||||
|
|
@ -546,9 +567,9 @@ a:focus { outline: none; }
|
|||
max-width: 340px;
|
||||
}
|
||||
.g_sep {
|
||||
width: 11px;
|
||||
border-left:
|
||||
solid 1px #fff;
|
||||
width: 12px;
|
||||
border-left: solid 1px #fff;
|
||||
@include box-sizing;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -572,7 +593,7 @@ a:focus { outline: none; }
|
|||
}
|
||||
|
||||
/* list item */
|
||||
.list_t_item { /*padding: 2px;*/ overflow: hidden; }
|
||||
.list_t_item { overflow: hidden; }
|
||||
.list_t_title {
|
||||
margin-bottom: 6px;
|
||||
color: #333;
|
||||
|
|
@ -592,155 +613,145 @@ a:focus { outline: none; }
|
|||
-webkit-text-size-adjust: none;
|
||||
}
|
||||
|
||||
/* Connection Page */
|
||||
#connection_setting { height: 492px; }
|
||||
#connection_setting .s_form {
|
||||
float: left;
|
||||
margin: 0 12px 0 0;
|
||||
padding-left: 24px;
|
||||
height: 100%;
|
||||
border-left: solid 1px #ddd;
|
||||
}
|
||||
#connection_setting .s_form:first-child { padding-left: 0; border: none; }
|
||||
#connection_setting .s_form label { line-height: 30px; }
|
||||
#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#connection_setting .s_form .c_name { padding: 0 12px; font-size: 18px; }
|
||||
#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { width: 202px; }
|
||||
#connection_setting .setting_btn { margin-left: 12px; }
|
||||
#connection_setting .setting_btn.disable { background-color: #ddd; cursor: default; }
|
||||
#connection_setting .c_status {
|
||||
float: right;
|
||||
padding: 6px;
|
||||
background-color: #eee;
|
||||
color: #ccc;
|
||||
font-size: 9px;
|
||||
font-weight: normal;
|
||||
-webkit-text-size-adjust: none;
|
||||
@include transition-type("background-color",0.5);
|
||||
}
|
||||
#connection_setting .c_status_on { background-color: #51A351; color: #fff; }
|
||||
#connection_setting .c_info {
|
||||
padding: 7px 6px;
|
||||
background-color: #fcfcfc;
|
||||
cursor: default;
|
||||
font-size: 18px;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/* 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;
|
||||
}
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; }
|
||||
[page-name="journal_p_list"] .list_item_action .icon-check { color: #333; font-size: 20px; }
|
||||
[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;
|
||||
}
|
||||
.icon-star-empty { color: #999; font-size: 20px; }
|
||||
.icon-star { color: #faa732; font-size: 20px; }
|
||||
.icon-check-empty { color: #999; font-size: 20px; }
|
||||
.icon-check { color: #333; font-size: 20px; }
|
||||
}
|
||||
|
||||
.file_view {
|
||||
.list_t_des {
|
||||
overflow: hidden;
|
||||
}
|
||||
.file {
|
||||
float: left;
|
||||
width: 120px;
|
||||
height: 50px;
|
||||
padding: 6px;
|
||||
margin: 1px;
|
||||
position: relative;
|
||||
@include box-sizing;
|
||||
|
||||
[page-name="journal_p_list"] .list_t_item.file_view {
|
||||
height: 148px;
|
||||
}
|
||||
[page-name="journal_p_list"] .file_view .file {
|
||||
display: inline-block;
|
||||
width: 62px;
|
||||
height: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
[page-name="journal_p_list"] .file_view .file:hover {
|
||||
background-color: #ddd;
|
||||
}
|
||||
[page-name="journal_p_list"] .file_view .file img {
|
||||
width: 24px;
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
margin-top: 4px;
|
||||
}
|
||||
[page-name="journal_p_list"] .file_view .filetitle {
|
||||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none;
|
||||
&:hover {
|
||||
background-color: lighten($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 Paper Add */
|
||||
#paper_add .s_grid_con {
|
||||
float: left;
|
||||
height: 456px;
|
||||
margin-left: 12px;
|
||||
padding-left: 12px;
|
||||
border-left: solid 1px #eee;
|
||||
#paper_add {
|
||||
.s_grid_con {
|
||||
float: left;
|
||||
height: 456px;
|
||||
margin-left: 12px;
|
||||
padding-left: 12px;
|
||||
border-left: solid 1px #eee;
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
padding-left: 0;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
.f_w { width: 336px; }
|
||||
label { margin-right: 0; }
|
||||
}
|
||||
#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; }
|
||||
|
||||
/* 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;
|
||||
[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"] {}
|
||||
[page-name="journal_p_coauthor"] .list_t_item {
|
||||
height: 110px;
|
||||
}
|
||||
[page-name="journal_p_coauthor"] .list_item_function {}
|
||||
[page-name="journal_p_coauthor"] .list_item_function a {
|
||||
display: inline-block;
|
||||
padding: 4px;
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none;
|
||||
}
|
||||
[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;
|
||||
[page-name="journal_p_coauthor"] {
|
||||
.list_t_item {
|
||||
height: 110px;
|
||||
}
|
||||
.list_item_function {}
|
||||
.list_item_function a {
|
||||
display: inline-block;
|
||||
padding: 4px;
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 11px;
|
||||
-webkit-text-size-adjust: none;
|
||||
}
|
||||
.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;*/
|
||||
}
|
||||
[page-name="journal_p_coauthor_relation"] .form_space {
|
||||
margin-bottom: 10px;
|
||||
font-size: 18px;
|
||||
font-family: Arial, sans-serif;
|
||||
[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;
|
||||
}
|
||||
}
|
||||
/* Journal New Co-Author */
|
||||
#new_co_author label {
|
||||
|
|
@ -759,18 +770,19 @@ a:focus { outline: none; }
|
|||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 12;
|
||||
}
|
||||
.app_frame .app_holder {
|
||||
background-color: #fff;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
||||
.app_frame #header .icon-remove {
|
||||
display: block;
|
||||
float: right;
|
||||
line-height: 60px;
|
||||
font-size: 20px;
|
||||
cursor: pointer;
|
||||
|
||||
.app_holder {
|
||||
background-color: #fff;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
||||
#header .icon-remove {
|
||||
display: block;
|
||||
float: right;
|
||||
line-height: 60px;
|
||||
font-size: 20px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
/*Tooltip popup */
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
position: absolute;
|
||||
z-index: 9999;
|
||||
top: 100%;
|
||||
background: #fff;
|
||||
background-color: #dddddd;
|
||||
color: #000;
|
||||
border: 1px solid #dddddd;
|
||||
border-top: 0; }
|
||||
|
|
@ -98,12 +98,12 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
|
||||
.select2-container .select2-choice div {
|
||||
display: block;
|
||||
width: 20px;
|
||||
width: 21px;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
background: #ccc;
|
||||
border-left: solid 1px #dddddd;
|
||||
-webkit-box-sizing: border-box;
|
||||
/* webkit */
|
||||
-khtml-box-sizing: border-box;
|
||||
|
|
@ -119,7 +119,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url("select2/select2.png") no-repeat 0 1px; }
|
||||
background: url("select2/select2.png") no-repeat 0 50%; }
|
||||
|
||||
.select2-search {
|
||||
display: inline-block;
|
||||
|
|
@ -159,16 +159,14 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
outline: none; }
|
||||
|
||||
.select2-dropdown-open .select2-choice {
|
||||
border-bottom-color: transparent;
|
||||
background-color: #eee; }
|
||||
border-bottom-color: transparent; }
|
||||
|
||||
.select2-dropdown-open .select2-choice div {
|
||||
background: transparent;
|
||||
border-left: none;
|
||||
background-color: #dddddd;
|
||||
filter: none; }
|
||||
|
||||
.select2-dropdown-open .select2-choice div b {
|
||||
background-position: -18px 1px; }
|
||||
background-position: -20px 50%; }
|
||||
|
||||
/* results */
|
||||
.select2-results {
|
||||
|
|
@ -356,11 +354,11 @@ disabled look for disabled choices in the results dropdown
|
|||
|
||||
.select2-search-choice-close {
|
||||
display: block;
|
||||
width: 12px;
|
||||
height: 13px;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
position: absolute;
|
||||
right: 3px;
|
||||
top: 4px;
|
||||
top: 5px;
|
||||
font-size: 1px;
|
||||
outline: none;
|
||||
background: url("select2/select2.png") right top no-repeat; }
|
||||
|
|
@ -369,10 +367,10 @@ disabled look for disabled choices in the results dropdown
|
|||
left: 3px; }
|
||||
|
||||
.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
|
||||
background-position: right -11px; }
|
||||
background-position: right -20px; }
|
||||
|
||||
.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
|
||||
background-position: right -11px; }
|
||||
background-position: right -20px; }
|
||||
|
||||
/* disabled styles */
|
||||
.select2-container-multi.select2-container-disabled .select2-choices {
|
||||
|
|
@ -397,7 +395,8 @@ disabled look for disabled choices in the results dropdown
|
|||
|
||||
.select2-offscreen {
|
||||
position: absolute;
|
||||
left: -10000px; }
|
||||
left: -10000px;
|
||||
top: 0; }
|
||||
|
||||
/* Retina-ize icons */
|
||||
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
|
||||
|
|
|
|||
|
|
@ -86,8 +86,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
position: absolute;
|
||||
z-index: 9999;
|
||||
top: 100%;
|
||||
|
||||
background: #fff;
|
||||
background-color: $gray;
|
||||
color: #000;
|
||||
border: 1px solid $gray;
|
||||
border-top: 0;
|
||||
|
|
@ -101,12 +100,12 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
|
||||
.select2-container .select2-choice div {
|
||||
display: block;
|
||||
width: 20px;
|
||||
width: 21px;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
background: #ccc;
|
||||
border-left: solid 1px $gray;
|
||||
@include box-sizing;
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +113,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url('select2/select2.png') no-repeat 0 1px;
|
||||
background: url('select2/select2.png') no-repeat 0 50%;
|
||||
}
|
||||
|
||||
.select2-search {
|
||||
|
|
@ -167,16 +166,15 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
|
|||
|
||||
.select2-dropdown-open .select2-choice {
|
||||
border-bottom-color: transparent;
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.select2-dropdown-open .select2-choice div {
|
||||
background: transparent;
|
||||
border-left: none;
|
||||
background-color: $gray;
|
||||
// border-left: none;
|
||||
filter: none;
|
||||
}
|
||||
.select2-dropdown-open .select2-choice div b {
|
||||
background-position: -18px 1px;
|
||||
background-position: -20px 50%;
|
||||
}
|
||||
|
||||
/* results */
|
||||
|
|
@ -377,11 +375,11 @@ disabled look for disabled choices in the results dropdown
|
|||
|
||||
.select2-search-choice-close {
|
||||
display: block;
|
||||
width: 12px;
|
||||
height: 13px;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
position: absolute;
|
||||
right: 3px;
|
||||
top: 4px;
|
||||
top: 5px;
|
||||
font-size: 1px;
|
||||
outline: none;
|
||||
background: url('select2/select2.png') right top no-repeat;
|
||||
|
|
@ -392,10 +390,10 @@ disabled look for disabled choices in the results dropdown
|
|||
}
|
||||
|
||||
.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
|
||||
background-position: right -11px;
|
||||
background-position: right -20px;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
|
||||
background-position: right -11px;
|
||||
background-position: right -20px;
|
||||
}
|
||||
|
||||
/* disabled styles */
|
||||
|
|
@ -427,6 +425,7 @@ disabled look for disabled choices in the results dropdown
|
|||
.select2-offscreen {
|
||||
position: absolute;
|
||||
left: -10000px;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
/* Retina-ize icons */
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
<div class="overview" content-layout="simple" base-width="1000">
|
||||
<div class="s_title hh2">Section Names</div>
|
||||
<ul class="s_form" id="desktop_names">
|
||||
<li class="s_grid_row"><label for="s_name1">Section 1</label><input id="s_name1" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label for="s_name2">Section 2</label><input id="s_name2" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label for="s_name3">Section 3</label><input id="s_name3" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label for="s_name4">Section 4</label><input id="s_name4" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name1">Section 1</label><input id="s_name1" class="s_grid s_grid_8" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name2">Section 2</label><input id="s_name2" class="s_grid s_grid_8" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name3">Section 3</label><input id="s_name3" class="s_grid s_grid_8" type="text" value=""></li>
|
||||
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name4">Section 4</label><input id="s_name4" class="s_grid s_grid_8" type="text" value=""></li>
|
||||
</ul>
|
||||
<div class="s_subtitle">sample desciption</div>
|
||||
<div class="s_action">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<div class="theme_preview vp thmbgc" style="background-color: #000;" id="theme_preview_area">
|
||||
<div class="thmtxth hh1 hp" style="margin-left:108px;">Theme Text1</div>
|
||||
<div class="theme_plate">
|
||||
<div class="thmc4 h1 wh3"></div>
|
||||
<div class="thmc4 h1 wh2"></div>
|
||||
<div class="thmc1 h1 w1"><div class="thmtxt hp">Theme Text2</div></div>
|
||||
<div class="g_sep h1 op07"></div>
|
||||
<div class="thmc2 h1 w1"><div class="thmtxt hp">Theme Text</div></div>
|
||||
|
|
@ -30,10 +30,10 @@
|
|||
<div>
|
||||
<table id="color_input" cellpadding="0" cellspacing="0" border="0" width="528" >
|
||||
<tr>
|
||||
<th class="s_title hh2" width="190px">Theme Color</th>
|
||||
<th class="s_title hh2">Line Color</th>
|
||||
<th class="s_title hh2" width="120px">Text Color</th>
|
||||
<th class="s_title hh2" width="120px">Background Color</th>
|
||||
<th class="s_title size_small hh2" width="190px">Theme Color</th>
|
||||
<th class="s_title size_small hh2">Line Color</th>
|
||||
<th class="s_title size_small hh2" width="120px">Text Color</th>
|
||||
<th class="s_title size_small hh2" width="120px">Background Color</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,22 @@
|
|||
<div class="s_title hh2">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 class="s_grid_row"><%= f.label :current_password %>
|
||||
<%= f.password_field :current_password %></li>
|
||||
<li class="s_grid_row">
|
||||
<%= f.label :current_password, :class => 's_grid s_grid_4' %>
|
||||
<%= f.password_field :current_password, :class => 's_grid s_grid_8' %>
|
||||
</li>
|
||||
|
||||
<li class="s_grid_row"><%= f.label :password %>
|
||||
<%= f.password_field :password %></li>
|
||||
<li class="s_grid_row">
|
||||
<%= f.label :password, :class => 's_grid s_grid_4' %>
|
||||
<%= f.password_field :password, :class => 's_grid s_grid_8' %>
|
||||
</li>
|
||||
|
||||
<li class="s_grid_row"><%= f.label :password_confirmation %>
|
||||
<%= f.password_field :password_confirmation %></li>
|
||||
<li class="s_grid_row">
|
||||
<%= f.label :password_confirmation, :class => 's_grid s_grid_4' %>
|
||||
<%= f.password_field :password_confirmation, :class => 's_grid s_grid_8' %>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="s_action"><%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh1 hp" %></div>
|
||||
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
|
|||
var bindHandlers = function(){ // to bind handlers for list page
|
||||
o.simple_drop_down();
|
||||
}
|
||||
bindHandlers();
|
||||
|
||||
var bindSecondaryHandlers = function(){
|
||||
$("#journal_p div#paper_list a.icon-check-empty").click(function(){
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
|
|||
page ||= 1
|
||||
|
||||
@per_column = 5
|
||||
|
||||
case @view_by
|
||||
when "abstract"
|
||||
@per_column = 1
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
|
|||
def publication_record publication, view
|
||||
content_tag :li,
|
||||
"item" => "true",
|
||||
:class => "list_t_item" do
|
||||
:class => "list_t_item #{view}_view" do
|
||||
marker + \
|
||||
content(publication, view) + \
|
||||
edit_or_delete(publication)
|
||||
|
|
@ -69,14 +69,15 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
|
|||
content_tag(:span, file.title, :class => "filetitle"),
|
||||
file.file.url,
|
||||
:class => "file",
|
||||
"target" => "_blank")
|
||||
"target" => "_blank",
|
||||
"title" => file.title)
|
||||
}.inject(:+)
|
||||
end
|
||||
|
||||
def check_file_type file
|
||||
if not file.nil?
|
||||
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
|
||||
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
|
||||
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-sm-32_32.png"
|
||||
else
|
||||
file_type = ""
|
||||
end
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@
|
|||
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overview" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
|
||||
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
|
||||
<% @writing_journals.each do |w| %>
|
||||
<%= publication_record w, @view_by%>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue