diff --git a/app/assets/Archive/stylesheets/desktop/desktop-component.css b/app/assets/Archive/stylesheets/desktop/desktop-component.css
index 1baf8f1ca..7b1d638d8 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-component.css
+++ b/app/assets/Archive/stylesheets/desktop/desktop-component.css
@@ -93,7 +93,7 @@
left: 0;
top: 60px;
font-size: 15px;
- width: 120px;
+ min-width: 120px;
border: solid 2px #dddddd;
-webkit-box-sizing: border-box;
/* webkit */
@@ -128,7 +128,7 @@
font-size: 15px;
line-height: 36px; }
.s_menu li {
- border-top: solid 1px #dddddd; }
+ border-top: solid 1px #f7f7f7; }
.s_menu li:first-child {
border: none; }
.s_menu a {
@@ -138,24 +138,19 @@
.s_tab {
font-size: 15px;
line-height: 36px; }
-
-.s_tab ul {
- overflow: hidden; }
-
-.s_tab li {
- float: left; }
-
-.s_tab a {
- display: block; }
-
-.s_tab .admbg {
- background-color: #f0f0f0; }
+ .s_tab ul {
+ overflow: hidden; }
+ .s_tab li {
+ float: left; }
+ .s_tab a {
+ display: block; }
+ .s_tab .admbg {
+ background-color: #f0f0f0; }
.st_c {
display: none; }
-
-.st_c:first-child {
- display: block; }
+ .st_c:first-child {
+ display: block; }
/* simple form */
.s_form {
@@ -171,6 +166,9 @@
line-height: 32px; }
.s_form input[type=text],
.s_form input[type=password],
+ .s_form input[type=submit],
+ .s_form input[type=reset],
+ .s_form input[type=button],
.s_form select {
height: 32px;
margin-top: 0;
@@ -201,7 +199,6 @@
.s_form input[type=text]:focus,
.s_form input[type=password]:focus,
.s_form textarea:focus {
- background-color: #f7f7f7;
border-color: #c4c4c4; }
.s_form textarea {
resize: none; }
@@ -254,7 +251,7 @@
font-size: 15px;
line-height: 36px;
position: relative;
- z-index: 9; }
+ z-index: 99; }
.toolbar .sdm, .toolbar .fn_g {
display: inline-block;
vertical-align: top; }
@@ -281,7 +278,8 @@
width: auto;
height: 100%;
overflow: hidden;
- position: relative; }
+ position: relative;
+ z-index: 10; }
.tinycanvas .overview {
position: absolute;
left: 0;
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-component.scss b/app/assets/Archive/stylesheets/desktop/desktop-component.scss
index 1f1da842d..3e6275d04 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-component.scss
+++ b/app/assets/Archive/stylesheets/desktop/desktop-component.scss
@@ -58,7 +58,7 @@
left: 0;
top: 60px;
font-size: 15px;
- width: 120px;
+ min-width: 120px;
border: solid 2px $gray;
@include box-sizing;
@@ -92,7 +92,7 @@
line-height: 36px;
li {
- border-top: solid 1px $gray;
+ border-top: solid 1px lighten($gray, 10%);
}
li:first-child {
border: none;
@@ -106,26 +106,28 @@
.s_tab {
font-size: 15px;
line-height: 36px;
+
+ ul {
+ overflow: hidden;
+ }
+ li {
+ float: left;
+ }
+ a {
+ display: block;
+ }
+ .admbg {
+ background-color: #f0f0f0;
+ }
}
.stb_h {}
.stb_v {}
-.s_tab ul {
- overflow: hidden;
-}
-.s_tab li {
- float: left;
-}
-.s_tab a {
- display: block;
-}
-.s_tab .admbg {
- background-color: #f0f0f0;
-}
.st_c {
display: none;
-}
-.st_c:first-child {
- display: block;
+
+ &:first-child {
+ display: block;
+ }
}
/* simple form */
@@ -147,6 +149,9 @@
}
input[type=text],
input[type=password],
+ input[type=submit],
+ input[type=reset],
+ input[type=button],
select {
height: 32px;
margin-top: 0;
@@ -168,7 +173,7 @@
@include box-sizing;
&:focus {
- background-color: lighten($gray, 10%);
+ // background-color: lighten($gray, 10%);
border-color: darken($gray, 10%);
}
}
@@ -232,7 +237,7 @@
font-size: 15px;
line-height: 36px;
position: relative;
- z-index: 9;
+ z-index: 99;
.sdm, .fn_g {
display: inline-block;
@@ -267,6 +272,7 @@
height: 100%;
overflow: hidden;
position: relative;
+ z-index: 10;
}
.overview {
position: absolute;
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-main.css b/app/assets/Archive/stylesheets/desktop/desktop-main.css
index 42bcbf7cb..56c6d38a2 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-main.css
+++ b/app/assets/Archive/stylesheets/desktop/desktop-main.css
@@ -121,13 +121,14 @@ a:focus {
background-color: #fff; }
.admbg2 {
- background-color: #ddd; }
+ background-color: #dddddd; }
.admtxt {
color: #666; }
-.admtxt:hover {
- color: #666; }
+a.admtxt.admbg2:hover {
+ color: #fff;
+ background-color: #aaaaaa; }
.hfn {
font-size: 15px;
@@ -341,12 +342,14 @@ a:focus {
/* panel */
#panel_l {
- background-color: #f0f0f0;
+ background-color: #fff;
float: left; }
#panel_r {
+ background-color: #f7f7f7;
margin-left: 252px;
- position: relative; }
+ position: relative;
+ width: auto; }
/* Desktop Notification */
#orbitnote {
@@ -577,8 +580,7 @@ a:focus {
padding: 24px 0;
margin-top: 12px;
overflow: hidden;
- border-top: solid 1px #eeeeee;
- background-color: #fff; }
+ border-top: solid 1px #eeeeee; }
.setting_btn {
display: block;
@@ -637,9 +639,10 @@ a:focus {
overflow: hidden; }
.list_t_title {
- margin-bottom: 6px;
- color: #333;
- font-size: 15px; }
+ padding-bottom: 6px;
+ color: #000;
+ font-size: 15px;
+ line-height: 1.3em; }
.list_t_des {
line-height: 1.5em;
@@ -647,147 +650,28 @@ a:focus {
margin-bottom: 4px;
font-size: 13px; }
-.list_item_function a {
- display: inline-block;
- padding: 4px;
- font-size: 11px;
- -webkit-text-size-adjust: none; }
-
-/* 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"] .file_view .list_t_des {
- overflow: hidden; }
-[page-name="journal_p_list"] .file_view .file {
- float: left;
- width: 120px;
- height: 50px;
- 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 {
- float: left;
- height: 456px;
- 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 .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; }
-
-/* 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;
- 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; }
-
-/* Journal New Co-Author */
-#new_co_author label {
- margin-right: 0; }
+.list_item_function {
+ position: absolute;
+ right: 0;
+ bottom: -30px;
+ width: 100%;
+ height: 30px;
+ line-height: 30px;
+ text-align: right;
+ -webkit-transition: all 0.3s ease;
+ -moz-transition: all 0.3s ease;
+ transition: all 0.3s ease; }
+ .list_item_function a {
+ display: inline-block;
+ vertical-align: top;
+ margin-left: 4px;
+ padding: 0 6px;
+ font-size: 11px;
+ -webkit-text-size-adjust: none; }
+ .list_item_function a :first-child {
+ margin-left: 0; }
+ .datalist_item:hover .list_item_function {
+ bottom: 0; }
/* App */
.app_frame {
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-main.scss b/app/assets/Archive/stylesheets/desktop/desktop-main.scss
index 334c57d59..57feca90e 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-main.scss
+++ b/app/assets/Archive/stylesheets/desktop/desktop-main.scss
@@ -113,9 +113,12 @@ a:focus { outline: none; }
/* Desktop Global Style */
.admbg { background-color: #fff; }
-.admbg2 { background-color: #ddd; }
+.admbg2 { background-color: $gray; }
.admtxt { color: #666; }
-.admtxt:hover { color: #666; }
+a.admtxt.admbg2:hover {
+ color: #fff;
+ background-color: darken($gray, 20%);
+}
.hfn {
font-size: 15px;
line-height: 36px;
@@ -285,12 +288,14 @@ a:focus { outline: none; }
}
/* panel */
#panel_l {
- background-color: #f0f0f0;
+ background-color: #fff;
float: left;
}
#panel_r {
+ background-color: lighten($gray, 10%);
margin-left: 252px;
position: relative;
+ width: auto;
}
/* Desktop Notification */
@@ -571,7 +576,7 @@ a:focus { outline: none; }
margin-top: 12px;
overflow: hidden;
border-top: solid 1px #eee;
- background-color: #fff;
+ // background-color: #fff;
}
.setting_btn {
display: block;
@@ -621,11 +626,14 @@ a:focus { outline: none; }
}
/* list item */
-.list_t_item { overflow: hidden; }
+.list_t_item {
+ overflow: hidden;
+}
.list_t_title {
- margin-bottom: 6px;
- color: #333;
+ padding-bottom: 6px;
+ color: #000;
font-size: 15px;
+ line-height: 1.3em;
// font-weight: normal;
}
.list_t_des {
@@ -634,158 +642,32 @@ a:focus { outline: none; }
margin-bottom: 4px;
font-size: 13px;
}
-.list_item_function a {
- display: inline-block;
- padding: 4px;
- font-size: 11px;
- -webkit-text-size-adjust: none;
-}
+.list_item_function {
+ position: absolute;
+ right: 0;
+ bottom: -30px;
+ width: 100%;
+ height: 30px;
+ line-height: 30px;
+ text-align: right;
+ @include transition-type(all,0.3);
-/* Journal Papers */
-[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;
-
- &: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;
-
- &:first-child {
- margin-left: 0;
- padding-left: 0;
- border: none;
- }
- }
- .f_w { width: 336px; }
- label { margin-right: 0; }
-}
-
-/* Journal Journal list */
-[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"] {
- .list_t_item {
- height: 110px;
- }
- .list_item_function {}
- .list_item_function a {
+ a {
display: inline-block;
- padding: 4px;
- font-family: Arial, sans-serif;
+ vertical-align: top;
+ margin-left: 4px;
+ padding: 0 6px;
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;*/
+ :first-child {
+ margin-left: 0;
+ }
}
- .form_space {
- margin-bottom: 10px;
- font-size: 18px;
- font-family: Arial, sans-serif;
+ .datalist_item:hover & {
+ bottom: 0;
}
}
-/* Journal New Co-Author */
-#new_co_author label {
- margin-right: 0;
-}
-
/* App */
.app_frame {
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-media.css b/app/assets/Archive/stylesheets/desktop/desktop-media.css
index e8fc7bfea..d7ded5d60 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-media.css
+++ b/app/assets/Archive/stylesheets/desktop/desktop-media.css
@@ -1,10 +1,10 @@
@media only screen and (min-width: 1240px){
- #panel_r.pw { width: 800px; }
+ /*#panel_r.pw { width: 800px; }*/
}
@media only screen and (min-width: 1900px){
- #panel_r.pw { width: 1400px; }
+ /*#panel_r.pw { width: 1400px; }*/
}
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.css b/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.css
new file mode 100644
index 000000000..f0c6ce6ea
--- /dev/null
+++ b/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.css
@@ -0,0 +1,115 @@
+/* Books */
+[page-name="books_list"] .list_t_item .inner {
+ padding-left: 30px; }
+[page-name="books_list"] .list_item_action {
+ font-size: 12px;
+ float: left;
+ margin-left: -30px; }
+ [page-name="books_list"] .list_item_action a {
+ display: block;
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ margin: 1px 1px 6px 1px; }
+ [page-name="books_list"] .list_item_action .icon-star-empty {
+ color: #999;
+ font-size: 20px; }
+ [page-name="books_list"] .list_item_action .icon-star {
+ color: #faa732;
+ font-size: 20px; }
+ [page-name="books_list"] .list_item_action .icon-check-empty {
+ color: #999;
+ font-size: 20px; }
+ [page-name="books_list"] .list_item_action .icon-check {
+ color: #333;
+ font-size: 20px; }
+[page-name="books_list"] .file_view .list_t_des {
+ overflow: hidden; }
+[page-name="books_list"] .file_view .file {
+ float: left;
+ width: 120px;
+ height: 50px;
+ 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="books_list"] .file_view .file:hover {
+ background-color: #f7f7f7; }
+ [page-name="books_list"] .file_view .file img {
+ width: 38px;
+ height: 38px;
+ position: absolute;
+ left: 6px;
+ top: 6px; }
+ [page-name="books_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 */ }
+
+/* Books Books list */
+[page-name="books_books"] .datalist_item .inner {
+ padding-left: 30px; }
+[page-name="books_books"] .list_item_action {
+ font-size: 12px;
+ float: left;
+ margin-left: -30px; }
+[page-name="books_books"] .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="books_books"] .list_t_desc {
+ font-family: Arial, sans-serif;
+ font-size: 12px;
+ color: #999; }
+
+/* Books Co-Author */
+[page-name="books_coauthor"] .list_t_item {
+ height: 110px; }
+[page-name="books_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="books_coauthor"] .info {
+ font-family: Arial, sans-serif; }
+[page-name="books_coauthor"] .info li {
+ margin-bottom: 8px;
+ color: #999; }
+[page-name="books_coauthor"] .info .name {
+ font-size: 18px;
+ line-height: 24px;
+ color: #333; }
+
+/* Books Co-Author Relationship*/
+[page-name="books_coauthor_relation"] .edit_co_author_relation {
+ /*margin-left: -10px;*/ }
+[page-name="books_coauthor_relation"] .form_space {
+ margin-bottom: 10px;
+ font-size: 18px;
+ font-family: Arial, sans-serif; }
diff --git a/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.scss b/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.scss
new file mode 100644
index 000000000..ddafade97
--- /dev/null
+++ b/vendor/built_in_modules/personal_book/app/assets/stylesheets/personal_book/desktop/personal_book.scss
@@ -0,0 +1,123 @@
+@import "desktop-helper";
+
+/* Books */
+[page-name="books_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;
+
+ &: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;
+ }
+ }
+ }
+}
+
+/* Books Books list */
+[page-name="books_books"] {
+
+ .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;
+ }
+}
+
+/* Books Co-Author */
+[page-name="books_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;
+ }
+}
+
+/* Books Co-Author Relationship*/
+[page-name="books_coauthor_relation"]{
+ .edit_co_author_relation {
+ /*margin-left: -10px;*/
+ }
+ .form_space {
+ margin-bottom: 10px;
+ font-size: 18px;
+ font-family: Arial, sans-serif;
+ }
+}
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
index d9f98c606..dc968db00 100644
--- a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
+++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
@@ -13,6 +13,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
var bindHandlers = function(){ // to bind handlers for list page
o.simple_drop_down();
}
+ bindHandlers();
var bindSecondaryHandlers = function(){
$("#conference_p div#paper_list a.icon-check-empty").click(function(){
diff --git a/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.css b/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.css
new file mode 100644
index 000000000..7ecd9d3a9
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.css
@@ -0,0 +1,109 @@
+/* Conference Papers */
+[page-name="conference_p_list"] .list_t_item .inner {
+ padding-left: 30px; }
+[page-name="conference_p_list"] .list_item_action {
+ font-size: 12px;
+ float: left;
+ margin-left: -30px; }
+ [page-name="conference_p_list"] .list_item_action a {
+ display: block;
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ margin: 1px 1px 6px 1px;
+ font-size: 20px; }
+ [page-name="conference_p_list"] .list_item_action .icon-star-empty, [page-name="conference_p_list"] .list_item_action .icon-check-empty {
+ color: #dddddd;
+ -webkit-transition: color 0.3s ease;
+ -moz-transition: color 0.3s ease;
+ transition: color 0.3s ease; }
+ [page-name="conference_p_list"] .list_item_action .icon-star-empty:hover, [page-name="conference_p_list"] .list_item_action .icon-check-empty:hover {
+ color: #aaaaaa; }
+ [page-name="conference_p_list"] .list_item_action .icon-star {
+ color: #faa732; }
+ [page-name="conference_p_list"] .list_item_action .icon-check {
+ color: #333; }
+[page-name="conference_p_list"] .file_view .list_t_des {
+ overflow: hidden; }
+[page-name="conference_p_list"] .file_view .file {
+ float: left;
+ width: 120px;
+ height: 50px;
+ 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="conference_p_list"] .file_view .file:hover {
+ background-color: #f7f7f7; }
+ [page-name="conference_p_list"] .file_view .file img {
+ width: 38px;
+ height: 38px;
+ position: absolute;
+ left: 6px;
+ top: 6px; }
+ [page-name="conference_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 */ }
+
+/* Conference Conference list */
+[page-name="conference_p_conference"] .datalist_item .inner {
+ padding-left: 30px; }
+[page-name="conference_p_conference"] .list_item_action {
+ font-size: 12px;
+ float: left;
+ margin-left: -30px; }
+[page-name="conference_p_conference"] .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="conference_p_conference"] .list_t_desc {
+ font-family: Arial, sans-serif;
+ font-size: 12px;
+ color: #999; }
+
+/* Conference Co-Author */
+[page-name="conference_p_coauthor"] .list_t_item {
+ height: 110px; }
+[page-name="conference_p_coauthor"] .info {
+ font-family: Arial, sans-serif; }
+[page-name="conference_p_coauthor"] .info li {
+ margin-bottom: 8px;
+ color: #999; }
+[page-name="conference_p_coauthor"] .info .name {
+ font-size: 18px;
+ line-height: 24px;
+ color: #333; }
+
+/* Conference Co-Author Relationship*/
+[page-name="conference_p_coauthor_relation"] .edit_co_author_relation {
+ /*margin-left: -10px;*/ }
+[page-name="conference_p_coauthor_relation"] .form_space {
+ margin-bottom: 10px;
+ font-size: 18px;
+ font-family: Arial, sans-serif; }
diff --git a/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.scss b/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.scss
new file mode 100644
index 000000000..3fcc2d3c5
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/assets/stylesheets/personal_conference/desktop/personal_conference.scss
@@ -0,0 +1,124 @@
+@import "desktop-helper";
+
+/* Conference Papers */
+[page-name="conference_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;
+ font-size: 20px;
+ }
+ .icon-star-empty, .icon-check-empty {
+ color: $gray;
+ @include transition-type(color,0.3);
+
+ &:hover {
+ color: darken($gray, 20%);
+ }
+ }
+ .icon-star { color: #faa732; }
+ .icon-check { color: #333; }
+ }
+
+ .file_view {
+ .list_t_des {
+ overflow: hidden;
+ }
+ .file {
+ float: left;
+ width: 120px;
+ height: 50px;
+ padding: 6px;
+ margin: 1px;
+ position: relative;
+ @include box-sizing;
+
+ &: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;
+ }
+ }
+ }
+}
+
+/* Conference Conference list */
+[page-name="conference_p_conference"] {
+
+ .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;
+ }
+}
+
+/* Conference Co-Author */
+[page-name="conference_p_coauthor"] {
+ .list_t_item {
+ height: 110px;
+ }
+ .list_item_function {}
+ .list_item_function a {}
+ .info {
+ font-family: Arial, sans-serif;
+ }
+ .info li {
+ margin-bottom: 8px;
+ color: #999;
+ }
+ .info .name {
+ font-size: 18px;
+ line-height: 24px;
+ color: #333;
+ }
+}
+
+/* Conference Co-Author Relationship*/
+[page-name="conference_p_coauthor_relation"]{
+ .edit_co_author_relation {
+ /*margin-left: -10px;*/
+ }
+ .form_space {
+ margin-bottom: 10px;
+ font-size: 18px;
+ font-family: Arial, sans-serif;
+ }
+}
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
index d43c81f0c..87511aff5 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
@@ -1,11 +1,19 @@
-<%= f.text_field :relation %>
-
-<%= f.submit t("save"), class: "ini_input hp hh1 thmtxt thmc2", style: "margin-left: 10px;" %>
-<% if not @conference_co_author_relation.new_record? %>
- <%= submit_tag t("cancel"), "ajax-remote" => "get", :herf => panel_personal_conference_desktop_conference_co_author_relations_path ,:type => "button", class: "bt-cancel-type ini_input hp hh1 thmtxt" %>
-<% end %>
+
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
index 5d447a803..9fd29a47a 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
@@ -1,4 +1,4 @@
-
+
<% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %>
-
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
index e053daeac..806480981 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
@@ -7,7 +7,7 @@
-
+
<% @conference_co_authors.each_with_index do |co_author,i| %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index e08201f7e..5a41a476d 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -3,7 +3,7 @@
<%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
<% if not @writing_conference.new_record? %>
- <%= submit_tag t("cancel"), :type => "button", "callback-method"=>"cancelpaper", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+ <%= submit_tag t("cancel"), :type => "button", "callback-method"=>"cancelpaper", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "fn_btn ini_input hp hh1 thmadm thmtxt" %>
<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
index f3e7371ee..03077edfc 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
@@ -16,7 +16,7 @@
-
+
<% @conference_lists.each_with_index do |conference_list,i| %>
-
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
index bcd3fd3c7..79229ec1f 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
@@ -69,9 +69,9 @@
-->
<% if @view_by.eql?"abstract" %>
-
+
<% else %>
-
+
<% end %>
<% @writing_conferences.each do |w| %>
<%= publication_record w, @view_by%>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
index 8f3be405b..d93ff6b4d 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
@@ -1,4 +1,5 @@
<%= javascript_include_tag "personal_conference" %>
+<%= stylesheet_link_tag "/assets/personal_conference/desktop/personal_conference" %>