reader优化界面 多语言multi-language #26

app/calendar/index.php

@@ -743,7 +743,7 @@ var num_s=Math.round((angle-num_d)*60-num_m);
 	}
 	return(angle_str);
 }
-function dwan_noon_display(){
+function dawn_noon_display(){
 	var Unix_string=document.getElementById('time_string').innerHTML
 	var Unix_Array=Unix_string.split("-");
 	var time_A=new Date();
@@ -792,7 +792,7 @@ function dwan_noon_display(){
 		$("#kala_inst_1").html(gLocal.gui.no_string+gLocal.gui.eat);
 		$("#kala_inst_2").html(gLocal.gui.need_inform+gLocal.gui.no_string+gLocal.gui.gama_entry);
 	}
-t=setTimeout('dwan_noon_display()',1000)
+t=setTimeout('dawn_noon_display()',1000)
 
 }
 function set_time_string(date_obj){
@@ -1374,7 +1374,7 @@ function showError(error){
 	select_day_string=$('#cur_day_string')[0].innerText.split('-');
 		pali_date(select_day_string[0],select_day_string[1],select_day_string[2],select_day_string[3],select_day_string[4],select_day_string[5],g_coordinate_this)
 }
-dwan_noon_display();
+dawn_noon_display();
 function air_confirm(place){
 	confirm_position(place+"_position_input",place+"_position_result",place);
 	var coordinate= get_coordinate_num(place);

app/dict/language/default.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/dict/language/en.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/pcdl/css/reader.css

@@ -61,8 +61,8 @@ input[type="submit"] {
     font-weight: 500;
     font-size: 90%;
     background-color: rgba(255, 0, 0, 0);
-    color: red;
-    border: 1px solid red;
+    color: #757AF7;
+    border: 1px solid #ff000000;
     border-radius: 4px;
     margin: 2px;
     padding: 2px 12px;
@@ -87,7 +87,7 @@ input[type="submit"] {
 button:hover,
 input[type="button"]:hover,
 input[type="submit"]:hover {
-    background-color: red;
+    background-color: #ff000000;
     color: white;
 }
 
@@ -411,13 +411,16 @@ border-style: solid;
 border-color: transparent transparent black transparent; 
 }
 .tooltip:hover{
-color:red;
+color:#757AF7;
 }
 .tooltip:hover .tooltiptext {
     visibility: visible;
     opacity: 1;
 }
-
+#tool_bar_title{
+    font-family: times;
+    font-weight: bold;
+}
 
 
 #tool_bar_fix{

app/pcdl/img/send_out.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1598092515064" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9913" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1024 0L0 625.92l232.96 92.16L934.4 94.08 308.48 747.52v275.2l149.76-215.68 320 126.72z" p-id="9914"></path></svg>

app/pcdl/language/default.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/pcdl/language/en.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/pcdl/language/si.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="කියවනවා";//Read
 $module_gui_str['editor']['1004']="තොරතුරු  ලේඛනය ";//Info Panal
 $module_gui_str['editor']['1005']="වර්ණය";//Color
 $module_gui_str['editor']['1006']="සුදු";//White
-$module_gui_str['editor']['1007']="";//Dwan
+$module_gui_str['editor']['1007']="";//dawn
 $module_gui_str['editor']['1008']="රාත්‍රි ";//Night
 $module_gui_str['editor']['1009']="දර්ශනය ";//View
 $module_gui_str['editor']['1010']="G⁣ තේරුම";//G-Mean

app/pcdl/reader.php

@@ -1,3 +1,8 @@
+<?php
+require_once "../public/_pdo.php";
+require_once "../path.php";
+require_once '../public/load_lang.php';
+?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
@@ -338,10 +343,6 @@
 	</script>
 <body class="reader_body" >
 
-<?php
-require_once "../public/_pdo.php";
-require_once "../path.php";
-?>
 
 <style>
 		#para_nav {
@@ -402,9 +403,9 @@ sent{
 sent:hover{
 	background-color:#fefec1;
 }
-para{
+para {
     color: white;
-    background-color: #b76f03a3;
+    background-color:  #F1CA23;
     min-width: 2em;
     display: inline-block;
     text-align: center;
@@ -433,21 +434,27 @@ para:hover{
 		<!-- tool bar begin-->
 		<div id="main_tool_bar" class='reader_toolbar'>
 			<div id="index_nav">
-				<button onclick="setNaviVisibility()">M</button>
+				<button onclick="setNaviVisibility()">
+					<svg t='1598084571450' class='icon' viewBox='0 0 1029 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='6428' width='20px' height='20px'><path d='M159.744 69.632 53.248 69.632C28.672 69.632 4.096 90.112 4.096 118.784l0 94.208c0 28.672 24.576 49.152 53.248 49.152l102.4 0C184.32 266.24 208.896 241.664 208.896 212.992L208.896 118.784C208.896 90.112 184.32 69.632 159.744 69.632zM970.752 69.632 368.64 69.632c-28.672 0-57.344 24.576-57.344 49.152l0 94.208c0 28.672 32.768 49.152 57.344 49.152l598.016 0c28.672 0 57.344-24.576 57.344-49.152L1024 118.784C1028.096 94.208 999.424 69.632 970.752 69.632zM159.744 413.696 53.248 413.696c-28.672 0-53.248 24.576-53.248 49.152l0 94.208c0 28.672 24.576 49.152 53.248 49.152l102.4 0c28.672 0 53.248-24.576 53.248-49.152l0-94.208C208.896 438.272 184.32 413.696 159.744 413.696zM970.752 413.696 368.64 413.696c-28.672 0-57.344 24.576-57.344 49.152l0 94.208c0 28.672 32.768 49.152 57.344 49.152l598.016 0c28.672 0 57.344-24.576 57.344-49.152l0-94.208C1028.096 438.272 999.424 413.696 970.752 413.696zM159.744 757.76 53.248 757.76c-28.672 0-53.248 24.576-53.248 49.152l0 94.208c0 28.672 24.576 49.152 53.248 49.152l102.4 0c28.672 0 53.248-24.576 53.248-49.152l0-94.208C208.896 782.336 184.32 757.76 159.744 757.76zM970.752 761.856 368.64 761.856c-28.672 0-57.344 24.576-57.344 49.152l0 94.208c0 28.672 32.768 49.152 57.344 49.152l598.016 0c28.672 0 57.344-24.576 57.344-49.152l0-94.208C1028.096 782.336 999.424 761.856 970.752 761.856z' fill='#757AF7' p-id='6429'></path></svg>
+				</button>
 			</div>
 			<div>
-				<span id="tool_bar_title">Title</span>
+				<span id="tool_bar_title"><?php echo $_local->gui->title; ?></span>
 			</div>
 			<div>
 				<div class="case_dropdown">
-					<p class="case_dropbtn"><button>A</button></p>
+					<p class="case_dropbtn"><button>
+						<svg t='1598086376923' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='8426' width='20px' height='20px'><path d='M609.745455 453.818182v130.327273h69.818181V535.272727H744.727273v377.018182h95.418182V535.272727H907.636364v48.872728h69.818181V453.818182z' p-id='8427' fill='#757AF7'></path><path d='M677.236364 300.218182V111.709091H46.545455V300.218182h69.818181v-51.2h162.909091v663.272727h165.236364V249.018182h162.909091v51.2z' p-id='8428' fill='#757AF7'></path></svg>
+					</button></p>
 					<div class="case_dropdown-content" style="right: 0;width:10em;">
 						<div ><button>A+</button><button>A-</button></div>
-						<div ><button>白</button><button>棕</button><button>夜s</button></div>
+						<div ><button><?php echo $_local->gui->white;?></button><button><?php echo $_local->gui->dawn;//棕?></button><button><?php echo $_local->gui->night;//夜?></button></div>
 					</div>
 				</div>
 				<div class="case_dropdown">
-					<p class="case_dropbtn"><button>┇</button></p>
+					<p class="case_dropbtn"><button>
+					<svg t='1598086493824' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='9217' width='20px' height='20px'><path d='M912.695652 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9218' fill='#757AF7'></path><path d='M512 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9219' fill='#757AF7'></path><path d='M111.304348 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9220' fill='#757AF7'></path></svg>
+					</button></p>
 					<div class="case_dropdown-content" style="right: 2em;min-width:6em;">
 						<a onclick="tool_changed('dighest')">书摘</a>
 						<a onclick="tool_changed('comments')">批注</a>
@@ -599,7 +606,9 @@ else{
 				$query = "select paragraph , toc from 'pali_text' where book='$book' and paragraph='$par_next' ";
 				$FetchPara = PDO_FetchAll($query);
 				if(count($FetchPara)>0){
-					$next_para_link = "<a href='reader.php?view={$_view}&book={$book}&para={$par_next}'><span id='para_nav_next'>{$FetchPara[0]["toc"]}</span><span  id='para_nav_next_a'>下一个</span></a>〉";
+					$next_para_link = "<a href='reader.php?view={$_view}&book={$book}&para={$par_next}'><span id='para_nav_next'>{$FetchPara[0]["toc"]}</span><span  id='para_nav_next_a'>";
+					$next_para_link .= "<svg t='1598093121925' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4451' width='32px' height='32px'><path d='M540.5696 102.4c-225.83296 0-409.6 183.74656-409.6 409.6s183.76704 409.6 409.6 409.6c225.85344 0 409.6-183.74656 409.6-409.6s-183.74656-409.6-409.6-409.6z m180.14208 439.84896l-109.19936 128.59392a46.65344 46.65344 0 0 1-65.86368 5.36576 46.71488 46.71488 0 0 1-5.38624-65.8432l43.86816-51.63008h-188.12928a46.6944 46.6944 0 1 1 0-93.42976h188.12928l-43.86816-51.63008a46.75584 46.75584 0 0 1 71.24992-60.47744l109.19936 128.59392c14.82752 17.408 14.82752 43.008 0 60.45696z' p-id='4452' fill='#757AF7'></path></svg>";
+					$next_para_link .= "</span></a>";
 				}
 				else{
 					$next_para_link = "没有查询到标题";
@@ -613,7 +622,9 @@ else{
 				$query = "select paragraph , toc from 'pali_text' where book='$book' and paragraph='$par_prev' ";
 				$FetchPara = PDO_FetchAll($query);
 				if(count($FetchPara)>0){
-					$prev_para_link = "〈<a href='reader.php?view={$_view}&book={$book}&para={$par_prev}'><span id='para_nav_prev_a'>前一个</span><span id='para_nav_prev'>{$FetchPara[0]["toc"]}</span></a>";
+					$prev_para_link = "<a href='reader.php?view={$_view}&book={$book}&para={$par_prev}'><span id='para_nav_prev_a'>";
+					$prev_para_link .= "<svg t='1598093521111' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4644' width='32' height='32'><path d='M540.5696 102.4c-225.83296 0-409.6 183.74656-409.6 409.6s183.76704 409.6 409.6 409.6c225.85344 0 409.6-183.74656 409.6-409.6s-183.74656-409.6-409.6-409.6z m144.54784 456.31488h-188.12928l43.84768 51.63008a46.6944 46.6944 0 0 1-35.59424 76.96384 46.55104 46.55104 0 0 1-35.61472-16.4864l-109.24032-128.59392a46.71488 46.71488 0 0 1 0-60.47744l109.24032-128.59392a46.6944 46.6944 0 1 1 71.20896 60.47744l-43.84768 51.63008h188.12928a46.6944 46.6944 0 1 1 0 93.45024z' p-id='4645' fill='#757AF7'></path></svg>";
+					$prev_para_link .= "</span><span id='para_nav_prev'>{$FetchPara[0]["toc"]}</span></a>";
 				}
 				else{
 					$prev_para_link = "没有查询到标题";
@@ -650,16 +661,22 @@ else{
 		break;
 		case "chapter":
 			if($par_parent >= 0){
-				echo "<a href='reader.php?view={$_view}&book={$book}&paragraph={$par_parent}'>▲{$_parent_title}</a>";
+				echo "<a href='reader.php?view={$_view}&book={$book}&paragraph={$par_parent}'>";
+				echo "<svg t='1598083209786' class='icon' style='fill:#666666;' height='30px' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4926'><path d='M446.464 118.784l-254.976 256c-13.312 13.312-4.096 35.84 15.36 35.84H716.8c18.432 0 28.672-22.528 15.36-35.84l-254.976-256c-9.216-8.192-22.528-8.192-30.72 0zM563.2 796.672V533.504c0-11.264-9.216-21.504-21.504-21.504H379.904c-11.264 0-21.504 9.216-21.504 21.504v366.592c0 11.264 9.216 21.504 21.504 21.504h467.968c11.264 0 21.504-9.216 21.504-21.504V839.68c0-11.264-9.216-21.504-21.504-21.504H584.704c-12.288 0-21.504-9.216-21.504-21.504z m0 21.504' p-id='4927'></path></svg>";
+				echo "{$_parent_title}</a>";
 			}
 		break;
 		case "para":
 			if($par_parent >= 0){
-				echo "<a href='reader.php?view=chapter&book={$book}&paragraph={$par_parent}'>▲{$_parent_title}</a>";
+				echo "<a href='reader.php?view=chapter&book={$book}&paragraph={$par_parent}'>";
+				echo "<svg t='1598083209786' class='icon' style='fill:#666666;' height='30px' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4926'><path d='M446.464 118.784l-254.976 256c-13.312 13.312-4.096 35.84 15.36 35.84H716.8c18.432 0 28.672-22.528 15.36-35.84l-254.976-256c-9.216-8.192-22.528-8.192-30.72 0zM563.2 796.672V533.504c0-11.264-9.216-21.504-21.504-21.504H379.904c-11.264 0-21.504 9.216-21.504 21.504v366.592c0 11.264 9.216 21.504 21.504 21.504h467.968c11.264 0 21.504-9.216 21.504-21.504V839.68c0-11.264-9.216-21.504-21.504-21.504H584.704c-12.288 0-21.504-9.216-21.504-21.504z m0 21.504' p-id='4927'></path></svg>";
+				echo "{$_parent_title}</a>";
 			}
 		break;
 		case "sent":
-				echo "<a href='reader.php?view=para&book={$book}&paragraph={$paragraph}'>▲{$paragraph}</a>";
+				echo "<a href='reader.php?view=para&book={$book}&paragraph={$paragraph}'>";
+				echo "<svg t='1598083209786' class='icon' style='fill:#666666;' height='30px' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4926'><path d='M446.464 118.784l-254.976 256c-13.312 13.312-4.096 35.84 15.36 35.84H716.8c18.432 0 28.672-22.528 15.36-35.84l-254.976-256c-9.216-8.192-22.528-8.192-30.72 0zM563.2 796.672V533.504c0-11.264-9.216-21.504-21.504-21.504H379.904c-11.264 0-21.504 9.216-21.504 21.504v366.592c0 11.264 9.216 21.504 21.504 21.504h467.968c11.264 0 21.504-9.216 21.504-21.504V839.68c0-11.264-9.216-21.504-21.504-21.504H584.704c-12.288 0-21.504-9.216-21.504-21.504z m0 21.504' p-id='4927'></path></svg>";
+				echo "{$paragraph}</a>";
 		break;
 		case 10:
 		break;
@@ -787,7 +804,14 @@ else{
 
 		//查询句子译文内容结束
 
-	echo "<div id='para_nav'><div>$prev_para_link</div><div>$next_para_link</div></div>";
+	echo "<div id='para_nav'>";
+	echo "<div style='display:inline-flex;'>";
+	echo "<svg t='1598094361320' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4933' width='32' height='32'><path d='M698.75712 684.4416a81.92 81.92 0 0 1-124.88704 106.06592l-191.488-225.4848a81.89952 81.89952 0 0 1 0-106.06592l191.488-225.4848a81.92 81.92 0 0 1 124.88704 106.06592l-146.45248 172.46208 146.45248 172.4416z' p-id='4934' fill='#757AF7'></path></svg>";
+	echo "$prev_para_link</div>";
+	echo "<div style='display:inline-flex;'>$next_para_link";
+	echo "<svg t='1598094021808' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4451' width='32' height='32'><path d='M698.75712 565.02272l-191.488 225.4848a81.73568 81.73568 0 0 1-62.48448 28.89728 81.89952 81.89952 0 0 1-62.40256-134.94272l146.432-172.4416-146.432-172.4416a81.92 81.92 0 0 1 124.88704-106.06592l191.488 225.4848a81.87904 81.87904 0 0 1 0 106.02496z' p-id='4452' fill='#757AF7'></path></svg>";
+	echo "</div>";
+	echo "</div>";
 
 	if(isset($album)){
 

app/public/lang/default.json

@@ -79,7 +79,7 @@
 		"down": "Down",
 		"download": "[Download]",
 		"draft": "As Draft",
-		"dwan": "Dwan",
+		"dawn": "dawn",
 		"each_paragraph": "E paragraph",
 		"each_sentence": "E sentence",
 		"eat": "eat",
@@ -317,7 +317,7 @@
 		"translate1": "Translated By ",
 		"translation": "Translation",
 		"translation_templet": "Translation Templet",
-		"twilight_time": "DWAN",
+		"twilight_time": "dawn",
 		"undo_shared": "undo shared",
 		"unsplit": "Slur Splited",
 		"up": "Up",

app/public/lang/en.json

@@ -79,7 +79,7 @@
 		"down": "Down",
 		"download": "[Download]",
 		"draft": "As Draft",
-		"dwan": "Dwan",
+		"dawn": "dawn",
 		"each_paragraph": "E paragraph",
 		"each_sentence": "E sentence",
 		"eat": "eat",
@@ -317,7 +317,7 @@
 		"translate1": "Translated By ",
 		"translation": "Translation",
 		"translation_templet": "Translation Templet",
-		"twilight_time": "DWAN",
+		"twilight_time": "dawn",
 		"undo_shared": "undo shared",
 		"unsplit": "Slur Splited",
 		"up": "Up",

app/public/lang/my.json

@@ -79,7 +79,7 @@
 		"down": "Down",
 		"download": "[Download]",
 		"draft": "As Draft",
-		"dwan": "Dwan",
+		"dawn": "dawn",
 		"each_paragraph": "E paragraph",
 		"each_sentence": "E sentence",
 		"eat": "eat",

app/public/lang/si.json

@@ -79,7 +79,7 @@
 		"down": "Down",
 		"download": "[Download]",
 		"draft": "As Draft",
-		"dwan": "අරුණ",
+		"dawn": "අරුණ",
 		"each_paragraph": "E paragraph",
 		"each_sentence": "E sentence",
 		"eat": "eat",

app/public/lang/zh-cn.json

@@ -79,7 +79,7 @@
 		"down": "向下",
 		"download": "下载",
 		"draft": "存草稿",
-		"dwan": "黄昏",
+		"dawn": "黄昏",
 		"each_paragraph": "逐段",
 		"each_sentence": "逐句",
 		"eat": "进餐",

app/public/lang/zh-tw.json

@@ -79,7 +79,7 @@
 		"down": "向下",
 		"download": "下載",
 		"draft": "存草稿",
-		"dwan": "黃昏",
+		"dawn": "黃昏",
 		"each_paragraph": "逐段",
 		"each_sentence": "逐句",
 		"eat": "進餐",

app/search/language/default.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/search/language/en.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/buddhist_calendar.php

@@ -622,8 +622,8 @@ echo "</div>";
 
 ?>
 <script language="javascript">
-dwan_noon_display();
-function dwan_noon_display(){
+dawn_noon_display();
+function dawn_noon_display(){
 	var Unix_string=document.getElementById('time_string').innerHTML
 	var Unix_Array=Unix_string.split("-");
 	var time_A=new Date();
@@ -660,7 +660,7 @@ function dwan_noon_display(){
 		$("#kala_inst_1").html(local_gui.no_string+local_gui.eat);
 		$("#kala_inst_2").html(local_gui.need_inform+local_gui.no_string+local_gui.gama_entry);
 	}
-t=setTimeout('dwan_noon_display()',1000)
+t=setTimeout('dawn_noon_display()',1000)
 
 }
 function set_time_string(date_obj){

app/studio/dictionary.php

@@ -77,7 +77,7 @@ else{
 				<button id="B_FontReduce" type="button" onclick="setPageFontSize(0.9)">A-</button> 
 				<button id="B_FontGain" type="button" onclick="setPageFontSize(1.1)">A+</button>
 				<button id="B_Day" type="button" onclick="setPageColor(0)">White</button>
-				<button id="B_Sunset" type="button" onclick="setPageColor(1)">Dwan</button>
+				<button id="B_Sunset" type="button" onclick="setPageColor(1)">dawn</button>
 				<button id="B_Night" type="button" onclick="setPageColor(2)">Night</button>
 				<span id="debug"></span>
 			</div>

app/studio/index.php

@@ -379,7 +379,7 @@ else{
 			<div class="help_fun_block">
 				<div class="title" ><?php echo $_local->gui->appearance;?></div>
 				<div >
-				<?php echo $_local->gui->theme;?>：<a><?php echo $_local->gui->night;?></a> <a><?php echo $_local->gui->white;?></a> <a><?php echo $_local->gui->dwan;?></a> <a><?php echo $_local->gui->more;?></a>
+				<?php echo $_local->gui->theme;?>：<a><?php echo $_local->gui->night;?></a> <a><?php echo $_local->gui->white;?></a> <a><?php echo $_local->gui->dawn;?></a> <a><?php echo $_local->gui->more;?></a>
 				</div>
 			</div>
 		</div>

app/studio/js/common.js

@@ -40,7 +40,7 @@ function setPageColor(sColor) {
 			cssobj.setAttribute("href", "css/color_day.css");
 			break;
 		case 1:
-			cssobj.setAttribute("href", "css/color_dwan.css");
+			cssobj.setAttribute("href", "css/color_dawn.css");
 			break;
 		case 2:
 			cssobj.setAttribute("href", "css/color_night.css");

app/studio/language/default.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/language/en.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/language/my.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/language/pali.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/module/editor/language/default.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/module/editor/language/en.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";

app/studio/module/editor/language/si.php

@@ -5,7 +5,7 @@ $module_gui_str['editor']['1003']="Read";
 $module_gui_str['editor']['1004']="Info Panal";
 $module_gui_str['editor']['1005']="Color";
 $module_gui_str['editor']['1006']="White";
-$module_gui_str['editor']['1007']="Dwan";
+$module_gui_str['editor']['1007']="dawn";
 $module_gui_str['editor']['1008']="Night";
 $module_gui_str['editor']['1009']="View";
 $module_gui_str['editor']['1010']="G-Mean";