language changes and conferences add/edit bug fixed

app/assets/stylesheets/desktop/desktop-component.css

@@ -50,6 +50,14 @@
     width: 384px; }
   .s_grid_row .s_grid_12 {
     width: 420px; }
+  .s_grid_row .s_grid_13 {
+    width: 456px; }
+  .s_grid_row .s_grid_14 {
+    width: 492px; }
+  .s_grid_row .s_grid_15 {
+    width: 528px; }
+  .s_grid_row .s_grid_16 {
+    width: 564px; }
   .s_grid_row:last-child {
     margin-bottom: 0; }
   .s_grid_row .s_grid_h_1 {
@@ -93,7 +101,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 +136,7 @@
   font-size: 15px;
   line-height: 36px; }
   .s_menu li {
-    border-top: solid 1px #dddddd; }
+    border-top: solid 1px #eaeaea; }
   .s_menu li:first-child {
     border: none; }
   .s_menu a {
@@ -138,31 +146,23 @@
 .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; }
 
 .st_c {
   display: none; }
 
-.st_c:first-child {
-  display: block; }
-
 /* simple form */
 .s_form {
   font-size: 15px; }
   .s_form label {
     font-size: 13px;
-    font-weight: bold;
     display: inline-block;
     vertical-align: middle;
     width: 100px;
@@ -172,6 +172,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;
@@ -202,7 +205,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; }
@@ -220,7 +222,8 @@
   .s_form .s_table thead th {
     border-bottom: solid 1px #eeeeee; }
 
-.check_box_g {
+/* simple select */
+.s_select_g {
   padding: 4px 8px;
   -webkit-box-sizing: border-box;
   /* webkit */
@@ -232,22 +235,89 @@
   /* ie */
   box-sizing: border-box;
   /* css3 */ }
-  .check_box_g li {
+  .s_select_g li {
     margin: 0 6px 6px 0;
     padding: 0; }
-  .check_box_g li,
+  .s_select_g li,
-  .check_box_g li > * {
+  .s_select_g li > * {
     display: inline-block;
     vertical-align: middle; }
-  .check_box_g label {
+  .s_select_g label {
     width: auto;
     margin: 0; }
-  .check_box_g > label {
+  .s_select_g > label {
     font-size: 15px;
     display: block;
     padding: 4px 0; }
-  .check_box_g li label {
+  .s_select_g li label {
-    padding-left: 4px; }
+    padding-left: 4px;
+    cursor: pointer; }
+    .s_select_g li label:before {
+      display: inline-block;
+      vertical-align: middle;
+      width: 14px;
+      height: 14px;
+      line-height: 14px;
+      text-align: center;
+      margin-right: 6px;
+      content: '';
+      border: solid 1px #c4c4c4; }
+  .s_select_g input[type=checkbox],
+  .s_select_g input[type=radio] {
+    display: none; }
+  .s_select_g input[type=checkbox]:checked + label:before, .s_select_g input[type=radio]:checked + label:before {
+    background-color: #444444;
+    border-color: #444444;
+    color: #fff;
+    font-family: "FontAwesome";
+    font-size: 12px; }
+  .s_select_g input[type=checkbox]:checked + label:before {
+    content: "\f00c"; }
+  .s_select_g input[type=radio] + label:before {
+    border-radius: 8px; }
+  .s_select_g input[type=radio]:checked + label:before {
+    content: "\f111";
+    font-size: 9px;
+    -webkit-text-size-adjust: none; }
+
+/* simple switch */
+.s_switch {
+  overflow: hidden; }
+  .s_switch .s_switch_status {
+    font-size: 1.5em;
+    line-height: 20px;
+    height: 20px;
+    float: left;
+    margin-right: 60px; }
+  .s_switch .s_switch_switcher {
+    display: block;
+    float: right;
+    position: relative;
+    width: 48px;
+    height: 20px;
+    overflow: hidden; }
+    .s_switch .s_switch_switcher input[type=checkbox] {
+      width: 144px;
+      height: 20px;
+      margin: 0;
+      position: absolute;
+      top: 0;
+      left: -96px; }
+      .s_switch .s_switch_switcher input[type=checkbox] + .s_switch_toggle {
+        display: block;
+        position: absolute;
+        left: -2px;
+        top: -2px;
+        width: 16px;
+        height: 20px;
+        background-color: #000;
+        border: solid 2px white;
+        cursor: pointer;
+        -webkit-transition: left 0.3s ease;
+        -moz-transition: left 0.3s ease;
+        transition: left 0.3s ease; }
+      .s_switch .s_switch_switcher input[type=checkbox]:checked + .s_switch_toggle {
+        left: 30px; }
 
 /* tool bar */
 .toolbar {
@@ -255,7 +325,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; }
@@ -282,13 +352,18 @@
     width: auto;
     height: 100%;
     overflow: hidden;
-    position: relative; }
+    position: relative;
+    z-index: 10; }
   .tinycanvas .overview {
     position: absolute;
     left: 0;
     top: 0;
-    min-width: 100%;
+    width: 100%;
     height: 100%; }
+    .tinycanvas .overview:after {
+      content: "";
+      display: table;
+      width: 100%; }
     .tinycanvas .overview > .column {
       float: left;
       border-right: solid 1px #eeeeee;
@@ -347,7 +422,7 @@
       width: 6px; }
   .tinycanvas .scrollbar {
     position: absolute;
-    z-index: 9;
+    z-index: 11;
     visibility: hidden;
     opacity: 0;
     -webkit-transition: opacity 0.3s ease;
@@ -358,7 +433,7 @@
       visibility: visible; }
     .tinycanvas .scrollbar.sb_h {
       left: 0;
-      bottom: -6px;
+      bottom: 0;
       height: 6px; }
     .tinycanvas .scrollbar.sb_v {
       right: 0;

app/assets/stylesheets/desktop/desktop-component.scss

@@ -19,9 +19,11 @@
 			margin-left: 0;
 		}
 	}
-	// fixed width column
+	// fixed width column with 12px gutter
-	// full width 420px
+	// 276px width for 8 columns
-	@for $i from 1 through 12 {
+	// 420px width for 12 columns
+	// 564px width for 16 columns
+	@for $i from 1 through 16 {
 		.s_grid_#{$i} {
 			width: 36px * $i - 12px;
 		}
@@ -38,6 +40,7 @@
 			height: 44px * $j - 12px;
 		}
 	}
+
 }
 
 /* simple dropdown menu */
@@ -58,7 +61,7 @@
 	left: 0;
 	top: 60px;
 	font-size: 15px;
-	width: 120px;
+	min-width: 120px;
 	border: solid 2px $gray;
 	@include box-sizing;
 
@@ -92,7 +95,7 @@
 	line-height: 36px;
 
 	li {
-		border-top: solid 1px $gray;
+		border-top: solid 1px lighten($gray, 5%);
 	}
 	li:first-child {
 		border: none;
@@ -106,27 +109,25 @@
 .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;
-}
 
 /* simple form */
 .s_form {
@@ -135,7 +136,6 @@
 	// basic style
 	label {
 		font-size: 13px;
-		font-weight: bold;
 		display: inline-block;
 		vertical-align: middle;
 		width: 100px;
@@ -148,6 +148,9 @@
 	}
 	input[type=text],
 	input[type=password],
+	input[type=submit],
+	input[type=reset],
+	input[type=button],
 	select {
 		height: 32px;
 		margin-top: 0;
@@ -169,7 +172,7 @@
 		@include box-sizing;
 
 		&:focus {
-			background-color: lighten($gray, 10%);
+			// background-color: lighten($gray, 10%);
 			border-color: darken($gray, 10%);
 		}
 	}
@@ -198,8 +201,8 @@
 	}
 }
 
-
+/* simple select */
-.check_box_g {
+.s_select_g {
 	padding: 4px 8px;
 	// border: solid 1px $gray;
 	@include box-sizing;
@@ -224,6 +227,87 @@
 	}
 	li label {
 		padding-left: 4px;
+		cursor: pointer;
+
+		&:before {
+			display: inline-block;
+			vertical-align: middle;
+			width: 14px;
+			height: 14px;
+			line-height: 14px;
+			text-align: center;
+			margin-right: 6px;
+			content: '';
+			border: solid 1px darken($gray, 10%);
+		}
+	}
+	input[type=checkbox],
+	input[type=radio]
+	{
+		display: none;
+	}
+	input[type=checkbox]:checked + label:before, input[type=radio]:checked + label:before {
+		background-color: darken($gray, 60%);
+		border-color: darken($gray, 60%);
+		color: #fff;
+		@include font-icon(12);
+	}
+	input[type=checkbox]:checked + label:before {
+		content: "\f00c";
+	}
+	input[type=radio] + label:before {
+		border-radius: 8px;
+	}
+	input[type=radio]:checked + label:before {
+		content: "\f111";
+		font-size: 9px;
+		-webkit-text-size-adjust: none;
+	}
+}
+
+/* simple switch */
+.s_switch {
+	overflow: hidden;
+
+	.s_switch_status {
+		font-size: 1.5em;
+		line-height: 20px;
+		height: 20px;
+		float: left;
+		margin-right: 60px;
+	}
+	.s_switch_switcher {
+		display: block;
+		float: right;
+		position: relative;
+		width: 48px;
+		height: 20px;
+		overflow: hidden;
+
+		input[type=checkbox] {
+			width: 144px;
+			height: 20px;
+			margin: 0;
+			position: absolute;
+			top: 0;
+			left: -96px;
+
+			+ .s_switch_toggle {
+				display: block;
+				position: absolute;
+				left: -2px;
+				top: -2px;
+				width: 16px;
+				height: 20px;
+				background-color: #000;
+				border: solid 2px #fff;
+				cursor: pointer;
+				@include transition-type(left,0.3);
+			}
+			&:checked  + .s_switch_toggle {
+				left: 30px;
+			}
+		}
 	}
 }
 
@@ -233,7 +317,7 @@
 	font-size: 15px;
 	line-height: 36px;
 	position: relative;
-	z-index: 9;
+	z-index: 99;
 
 	.sdm, .fn_g {
 		display: inline-block;
@@ -268,14 +352,21 @@
 		height: 100%;
 		overflow: hidden;
 		position: relative;
+		z-index: 10;
 	}
 	.overview {
 		position: absolute;
 		left: 0;
 		top: 0;
-		min-width: 100%;
+		width: 100%;
 		height: 100%;
 
+		&:after {
+			content: "";
+			display: table;
+			width: 100%;
+		}
+
 		> .column {
 			float: left;
 			border-right: solid 1px #eee;
@@ -329,7 +420,7 @@
 	}
 	.scrollbar {
 		position: absolute;
-		z-index: 9;
+		z-index: 11;
 		visibility: hidden;
 		opacity: 0;
 		@include transition-type(opacity, 0.3);
@@ -340,7 +431,7 @@
 		}
 		&.sb_h {
 			left: 0;
-			bottom: -6px;
+			bottom: 0;
 			height: 6px;
 		}
 		&.sb_v {

vendor/built_in_modules/personal_book/config/locales/zh_tw.yml

@@ -1,11 +1,11 @@
 zh_tw:
   module_name:
-    personal_book: 期刊著作
+    personal_book: 期刊
   personal_book:
     paper_title : "論文名稱"
     book_title : "期刊名稱"
-    extracted_chapters : "Extracted Chapters"
+    extracted_chapters : "部份章節"
-    publishers : "Publishers"
+    publishers : "出版社"
     authors : "作者"
     tags : "領域"
     year : "年度"
@@ -28,8 +28,8 @@ zh_tw:
     file : "檔案"
     file_name : "檔案名稱"
     description : "描述"
-    pages : "Pages"
+    pages : "頁次"
-    book_paper_type : "Book Paper Type"
+    book_paper_type : "期刊論文類別"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js

@@ -68,7 +68,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
     }
 
     uploadFiles();
-    preData();
+    // preData();
   }
 
   this.initializeConferencePapers.addpaper = function(){ // to open add pages in conference papers page

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb

@@ -50,8 +50,6 @@
                 size: "20",
                 placeholder: t("personal_conference.conference_title"),
                 class: "s_grid_12 s_grid",
-                "autocomplete" => "/panel/personal_conference/desktop/conference_pages/new.json",
-                "autocomplete-format" => "--:[text,email]",
                 value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %>
             <% end %>
         
@@ -210,24 +208,10 @@
       </div>
   <!-- </div>
 </div> -->
-    <%= stylesheet_link_tag "token-input-facebook" %>
-    <%= javascript_include_tag :defaults, "jquery.tokeninput" %>
    
 
-    <script>
+
-      $(document).ready(function(){
+    
-        $(function() {
-          $("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
-            crossDomain: false,
-            prePopulate: $("#writing_conference_author_tokens").data("pre"),
-            theme: "facebook",
-            hintText: "<%=t("hintText")%>",
-            noResultsText: "<%=t("noResultsText")%>",
-            searchingText: "<%=t("searchingText")%>"
-          });
-        });
-      });
-    </script>
 
 
 

vendor/built_in_modules/personal_diploma/config/locales/zh_tw.yml

@@ -1,11 +1,13 @@
 zh_tw:
   module_name:
-    personal_diploma: 期刊著作
+    personal_diploma: 學歷
   personal_diploma:
     paper_title : "論文名稱"
     book_title : "期刊名稱"
-    extracted_chapters : "Extracted Chapters"
+    extracted_chapters : "摘要"
-    publishers : "Publishers"
+    end_date : "結束日期"
+    start_date : "開始日期"
+    publishers : "出版社"
     authors : "作者"
     tags : "領域"
     year : "年度"
@@ -29,11 +31,10 @@ zh_tw:
     file_name : "檔案名稱"
     description : "描述"
     pages : "Pages"
-    book_paper_type : "Book Paper Type"
+    school_name : "學校名稱"
-    school_name : "School Name"
+    country : "國家"
-    country : "Country"
+    department : "系所"
-    department : "Department"
+    degree : "學位"
-    degree : "Degree"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/experience_window.html.erb

@@ -4,7 +4,7 @@
 	<div id="content">
 		<div id="header" class="hh2">
 			<div class="dtitle w2 hh2 hp">
-				<span class="thmtxth">Experience/Working</span>
+				<span class="thmtxth">Experience</span>
 			</div>
 			<div id="search_app" class="hfn w2 hh1 hp thmc3">
 			<input type="text" class="ini_input form" value="Search" id="searchbox" />

vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml

@@ -1,14 +1,15 @@
 zh_tw:
   module_name:
-    personal_experience: 期刊著作
+    personal_experience: 經歷
   personal_experience:
-    department : "Department"
+    department : "系所"
-    organizationt_title : "Organization Title"
+    experience_category : 經歷類別
+    end_date : "結束日期"
+    start_date : "開始日期"
+    organizationt_title : "服務機關名稱"
     paper_title : "論文名稱"
     book_title : "期刊名稱"
-    job_title : "Job Title"
+    job_title : "職務"
-    extracted_chapters : "Extracted Chapters"
-    publishers : "Publishers"
     authors : "作者"
     tags : "領域"
     year : "年度"
@@ -31,8 +32,6 @@ zh_tw:
     file : "檔案"
     file_name : "檔案名稱"
     description : "描述"
-    pages : "Pages"
-    book_paper_type : "Book Paper Type"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml

@@ -1,14 +1,12 @@
 zh_tw:
   module_name:
-    personal_honor: 期刊著作
+    personal_honor: 榮譽
   personal_honor:
     paper_title : "論文名稱"
     book_title : "期刊名稱"
-    award_name : "Award Name"
+    award_name : "獎項名稱"
-    awarding_unit : "Awarding Unit"
+    awarding_unit : "頒獎單位"
-    honor_category : "Honor Category"
+    honor_category : "類別"
-    extracted_chapters : "Extracted Chapters"
-    publishers : "Publishers"
     authors : "作者"
     tags : "領域"
     year : "年度"
@@ -31,8 +29,6 @@ zh_tw:
     file : "檔案"
     file_name : "檔案名稱"
     description : "描述"
-    pages : "Pages"
-    book_paper_type : "Book Paper Type"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

@@ -51,8 +51,6 @@
                 size: "20",
                 placeholder: t("personal_journal.journal_title"),
                 class: "s_grid_12 s_grid",
-                "autocomplete" => "/panel/personal_journal/desktop/journal_pages/new.json",
-                "autocomplete-format" => "--:[text,email]",
                 value: (@writing_journal.journal_title_translations[locale.to_s] rescue nil) %>
             <% end %>
             

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/lab_window.html.erb

@@ -4,7 +4,7 @@
 	<div id="content">
 		<div id="header" class="hh2">
 			<div class="dtitle w2 hh2 hp">
-				<span class="thmtxth">Books</span>
+				<span class="thmtxth">Labs</span>
 			</div>
 			<div id="search_app" class="hfn w2 hh1 hp thmc3">
 			<input type="text" class="ini_input form" value="Search" id="searchbox" />

vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml

@@ -1,17 +1,15 @@
 zh_tw:
   module_name:
-    personal_lab: Lab
+    personal_lab: 實驗室
   personal_lab:
-    book_title : "期刊名稱"
+    lab_title : "實驗室名稱"
-    lab_title : "Lab Title"
     extracted_chapters : "Extracted Chapters"
-    participating_professor : "Participating Professor"
+    participating_professor : "參與教授"
-    participating_student : "Participating Student"
+    participating_student : "參與學生"
-    research_direction : "Research Direction"
+    research_direction : "研究方向"
-    facility : "Facility"
+    facility : "設備"
-    extension_no : "Extension Number"
+    extension_no : "分機"
-    location : "Location"
+    location : "位置"
-    publishers : "Publishers"
     authors : "作者"
     tags : "領域"
     year : "年度"
@@ -34,8 +32,6 @@ zh_tw:
     file : "檔案"
     file_name : "檔案名稱"
     description : "描述"
-    pages : "Pages"
-    book_paper_type : "Book Paper Type"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml

@@ -1,13 +1,13 @@
 zh_tw:
   module_name:
-    personal_patent: Patent
+    personal_patent: 專利
   personal_patent:
-    patent_title : "Patent Title"
+    patent_title : "專利名稱"
     book_title : "期刊名稱"
     extracted_chapters : "Extracted Chapters"
-    patent_no : "Patent Number"
+    patent_no : "專利編號"
-    patent_country : "Patent Country"
+    patent_country : "專利國別"
-    patent_category : "Patent Category"
+    patent_category : "專利類別"
     publishers : "Publishers"
     authors : "作者"
     tags : "領域"
@@ -31,8 +31,6 @@ zh_tw:
     file : "檔案"
     file_name : "檔案名稱"
     description : "描述"
-    pages : "Pages"
-    book_paper_type : "Book Paper Type"
 
   create_success : "新增完成!!"
   update_success : "更新完成!!"

vendor/built_in_modules/personal_project/config/locales/zh_tw.yml

@@ -1,15 +1,15 @@
 zh_tw:
   module_name:
-    personal_project: 期刊著作
+    personal_project: 研究計畫
   personal_project:
-    project_title : "Project Title"
+    project_title : "計畫名稱"
-    job_title : "Job Title"
+    job_title : "職稱/擔任之工作"
-    participator : "Participartor"
+    participator : "參與人"
     extracted_chapters : "Extracted Chapters"
-    project_category : "Project Category"
+    project_category : "計畫類別"
-    end_date : "End Date"
+    end_date : "結束日期"
-    start_date : "Start Date"
+    start_date : "開始日期"
-    unit : "Unit"
+    unit : "補助/委託或合作機構"
     publishers : "Publishers"
     authors : "作者"
     tags : "領域"

vendor/built_in_modules/personal_research/config/locales/zh_tw.yml

@@ -1,10 +1,10 @@
 zh_tw:
   module_name:
-    personal_research: 期刊著作
+    personal_research: 研究
   personal_research:
     paper_title : "論文名稱"
-    research_title : "Research Title"
+    research_title : "名稱"
-    extracted_chapters : "Extracted Chapters"
+    extracted_chapters : "摘要"
     publishers : "Publishers"
     authors : "作者"
     tags : "領域"