Merge branch 'i18n' of https://gitlab.c3sl.ufpr.br/cdn/slx-admin into i18n

Conflicts:
	lang/i18n.php
	modules/translation.inc.php

5 files changed, 28 insertions, 22 deletions

diff --git a/templates/main-menu-login.html b/templates/main-menu-login.html
index 71e10b0e..81aef288 100644
--- a/templates/main-menu-login.html
+++ b/templates/main-menu-login.html
@@ -19,7 +19,7 @@
 						<li><a href="?do=SysConfig">{{lang_localization}}</a></li>
 						<li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li>
 						<li><a href="?do=BaseConfig">{{lang_configurationVariables}}</a></li>
-						<li><a href="?do=Admin">{{lang_administration}}</a></li>
+						<li><a href="?do=Translation">{{lang_administration}}</a></li>
 						<li class="divider"></li>
 						<li class="dropdown-header">{{lang_server}}</li>
 						<li><a href="?do=ServerSetup">{{lang_configurationBasic}}</a></li>
diff --git a/templates/main-menu-logout.html b/templates/main-menu-logout.html
index 1721161e..d5671fef 100644
--- a/templates/main-menu-logout.html
+++ b/templates/main-menu-logout.html
@@ -19,7 +19,7 @@
 						<li><a href="?do=SysConfig">{{lang_localization}}</a></li>
 						<li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li>
 						<li><a href="?do=BaseConfig">{{lang_configurationVariables}}</a></li>
-						<li><a href="?do=Admin">{{lang_administration}}</a></li>
+						<li><a href="?do=Translation">{{lang_administration}}</a></li>
 						<li class="divider"></li>
 						<li class="dropdown-header">{{lang_server}}</li>
 						<li><a href="?do=ServerSetup">{{lang_configurationBasic}}</a></li>
diff --git a/templates/administration/_page.html b/templates/translation/_page.html
index ac24ed71..8e5e4bab 100644
--- a/templates/administration/_page.html
+++ b/templates/translation/_page.html
@@ -7,7 +7,7 @@
 			<p>{{lang_adminInfo}}</p>
 		</div>
 		<ul class="list-group">
-			<a href="?do=Admin&page=messages" class="list-group-item active">{{lang_editMessages}}</a>
+			<a href="?do=Translation&page=messages" class="list-group-item active">{{lang_editMessages}}</a>
 		</ul>
 	</div>
 	<div class="panel panel-default">
@@ -24,9 +24,9 @@
 				{{#table}}
 					<tr onclick="goTo('{{link}}');">
 						<td>{{template}}</td>
-						<td style='width:230px;text-align:center;'>{{de}}</td>
-						<td style='width:230px;text-align:center;'>{{en}}</td>
-						<td style='width:230px;text-align:center;'>{{pt}}</td>
+						<td style='width:230px;text-align:center;'>{{{de}}}</td>
+						<td style='width:230px;text-align:center;'>{{{en}}}</td>
+						<td style='width:230px;text-align:center;'>{{{pt}}}</td>
 					</tr>
 				{{/table}}
 			</tbody>
@@ -35,6 +35,6 @@
 </div>
 <script>
 function goTo(link){
-	window.location.href = "?do=Admin&page=templates&template=" + link;
+	window.location.href = "?do=Translation&page=templates&template=" + link;
 }
 </script>
diff --git a/templates/administration/messages.html b/templates/translation/messages.html
index 7cf042e8..c065c7f7 100644
--- a/templates/administration/messages.html
+++ b/templates/translation/messages.html
@@ -4,9 +4,12 @@
 			{{lang_messages}}
 		</div>
 		<div class="panel-body">
-			<p>{{lang_templateMessagesHelp}}
+			<p>{{lang_templateMessagesHelp}}</p>
+			<div class="alert alert-info">
+				{{lang_templateHint}}
+			</div>
 		</div>
-		<form action="?do=Admin" method="post">
+		<form action="?do=Translation" method="post">
 			<table class="table table-hover">
 				<thead>
 					<tr>
@@ -31,7 +34,7 @@
 								<input type="text" class="form-control" placeholder="{{lang_portugueseTAG}}" value="{{pt}}" name="lang#pt#{{tag}}">
 							</td>
 							<td style='text-align:center;'>
-								<a class="btn btn-danger btn-xs" href="?do=Admin&template=messages&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
+								<a class="btn btn-danger btn-xs" href="?do=Translation&template=messages&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
 							</td>
 						</tr>
 					{{/msgs}}
@@ -40,15 +43,15 @@
 				</tbody>
 			</table>
 			<div class="panel-body">
-				<a class="btn btn-primary" href='?do=Admin' >{{lang_back}}</a> 
+				<a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a> 
 				<button class="btn btn-primary" type="button" onclick="addTag(false);" >{{lang_newTag}}</button> 
 				<input type="hidden" name="update" value="true">
 				<input type="hidden" name="path" value="messages">
 				<input type="hidden" name="token" value="{{token}}">
-				<input type="submit" class="btn btn-primary" value="{{lang_update}}">
+				<input type="submit" class="btn btn-primary" value="{{lang_save}}">
 				</form>
 			</div>
-		<form action="?do=Admin" method="post">
+		<form action="?do=Translation" method="post">
 			<table class="table table-hover">
 				<thead>
 					<tr>
@@ -73,7 +76,7 @@
 								<input type="text" class="form-control" placeholder="{{lang_portugueseTAG}}" value="{{pt}}" name="lang#pt#{{tag}}">
 							</td>
 							<td style='text-align:center;'>
-								<a class="btn btn-danger btn-xs" href="?do=Admin&template=messages-hardcoded&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
+								<a class="btn btn-danger btn-xs" href="?do=Translation&template=messages-hardcoded&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
 							</td>
 						</tr>
 					{{/msgsHC}}
@@ -82,12 +85,12 @@
 				</tbody>
 			</table>
 			<div class="panel-body">
-				<a class="btn btn-primary" href='?do=Admin' >{{lang_back}}</a> 
+				<a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a> 
 				<button class="btn btn-primary" type="button" onclick="addTag(true);" >{{lang_newTag}}</button> 
 				<input type="hidden" name="update" value="true">
 				<input type="hidden" name="path" value="messages-hardcoded">
 				<input type="hidden" name="token" value="{{token}}">
-				<input type="submit" class="btn btn-primary" value="{{lang_update}}">
+				<input type="submit" class="btn btn-primary" value="{{lang_save}}">
 				</form>
 			</div>
 	</div>
diff --git a/templates/administration/template.html b/templates/translation/template.html
index 5a89bb3d..11d4e4e7 100644
--- a/templates/administration/template.html
+++ b/templates/translation/template.html
@@ -4,8 +4,11 @@
 			{{template}}
 		</div>
 		<div class="panel-body">
-			<p>{{lang_templateAdminHelp}}
-			<form action="?do=Admin" method="post">
+			<p>{{lang_templateAdminHelp}}</p>
+			<div class="alert alert-info">
+				{{lang_templateHint}}
+			</div>
+			<form action="?do=Translation" method="post">
 				<table class="table table-hover">
 					<thead>
 						<tr>
@@ -30,7 +33,7 @@
 									<input type="text" class="form-control" placeholder="{{lang_portugueseTAG}}" value="{{pt}}" name="lang#pt#{{tag}}">
 								</td>
 								<td style='text-align:center;'>
-									<a class="btn btn-danger btn-xs" href="?do=Admin&template={{path}}&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
+									<a class="btn btn-danger btn-xs" href="?do=Translation&template={{template}}&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
 								</td>
 							</tr>
 						{{/tags}}
@@ -38,12 +41,12 @@
 						</tr>
 					</tbody>
 				</table>
-				<a class="btn btn-primary" href='?do=Admin' >{{lang_back}}</a>
+				<a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a>
 				<button class="btn btn-primary" type="button" onclick="addTag(true);" >{{lang_createTag}}</button> 
 				<input type="hidden" name="update" value="true">
-				<input type="hidden" name="path" value="{{path}}">
+				<input type="hidden" name="path" value="{{template}}">
 				<input type="hidden" name="token" value="{{token}}">
-				<input type="submit" class="btn btn-primary" value="{{lang_update}}">
+				<input type="submit" class="btn btn-primary" value="{{lang_save}}">
 			</form>
 		</div>
 	</div>