[i18n] Language handling is now completely dynamic, no more hardcoded de,en,pt

6 files changed, 53 insertions, 152 deletions

diff --git a/templates/main-menu-login.html b/templates/main-menu-login.html
index 81aef288..3f06e40b 100644
--- a/templates/main-menu-login.html
+++ b/templates/main-menu-login.html
@@ -29,12 +29,12 @@
 				<li><a href="?do=News">{{lang_news}}</a></li>
 				<li><a href="?do=SystemStatus">Status</a></li>
 				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{lang}}/flag.png"><b class="caret"></b></a>
+					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a>
 					<ul class="dropdown-menu">
 						<li class="dropdown-header">{{lang_language}}</li>
-						<li><a href="?lang=de&amp;url={{url}}"><img src="lang/de/flag.png"> Deutsch</a></li>
-						<li><a href="?lang=en&amp;url={{url}}"><img src="lang/en/flag.png"> English</a></li>
-						<li><a href="?lang=pt&amp;url={{url}}"><img src="lang/pt/flag.png"> Português</a></li>
+						{{#langs}}
+						<li><a href="?lang={{cc}}&amp;url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li>
+						{{/langs}}
 					</ul>
 				</li>
 			</ul>
diff --git a/templates/main-menu-logout.html b/templates/main-menu-logout.html
index d5671fef..149e0369 100644
--- a/templates/main-menu-logout.html
+++ b/templates/main-menu-logout.html
@@ -29,12 +29,12 @@
 				<li><a href="?do=News">{{lang_news}}</a></li>
 				<li><a href="?do=SystemStatus">Status</a></li>
 				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{lang}}/flag.png"><b class="caret"></b></a>
+					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a>
 					<ul class="dropdown-menu">
 						<li class="dropdown-header">{{lang_language}}</li>
-						<li><a href="?lang=de&amp;url={{url}}"><img src="lang/de/flag.png"> Deutsch</a></li>
-						<li><a href="?lang=en&amp;url={{url}}"><img src="lang/en/flag.png"> English</a></li>
-						<li><a href="?lang=pt&amp;url={{url}}"><img src="lang/pt/flag.png"> Português</a></li>
+						{{#langs}}
+						<li><a href="?lang={{cc}}&amp;url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li>
+						{{/langs}}
 					</ul>
 				</li>
 			</ul>
diff --git a/templates/translation/_page.html b/templates/translation/_page.html
index 8e5e4bab..dee651a7 100644
--- a/templates/translation/_page.html
+++ b/templates/translation/_page.html
@@ -5,36 +5,12 @@
 		</div>
 		<div class="panel-body">
 			<p>{{lang_adminInfo}}</p>
+			<ul class="nav nav-pills nav-stacked">
+				<li><a href="?do=Translation&amp;page=templates">{{lang_editTemplates}}</a></li>
+				<li><a href="?do=Translation&amp;page=messages">{{lang_editMessages}}</a></li>
+				<li><a href="?do=Translation&amp;page=hardcoded">{{lang_editHardcoded}}</a></li>
+				<li><a href="?do=Translation&amp;page=settings">{{lang_editSettings}}</a></li>
+			</ul>
 		</div>
-		<ul class="list-group">
-			<a href="?do=Translation&page=messages" class="list-group-item active">{{lang_editMessages}}</a>
-		</ul>
-	</div>
-	<div class="panel panel-default">
-		<table class="table table-hover">
-			<thead>
-				<tr>
-					<th>Template</th>
-					<th style='text-align:center;'>{{lang_german}}</th>
-					<th style='text-align:center;'>{{lang_english}}</th>
-					<th style='text-align:center;'>{{lang_portuguese}}</th>
-				<tr>
-			</thead>
-			<tbody>
-				{{#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>
-					</tr>
-				{{/table}}
-			</tbody>
-		</table>
 	</div>
 </div>
-<script>
-function goTo(link){
-	window.location.href = "?do=Translation&page=templates&template=" + link;
-}
-</script>
diff --git a/templates/translation/template.html b/templates/translation/edit.html
index 87c0f01b..049be6cb 100644
--- a/templates/translation/template.html
+++ b/templates/translation/edit.html
@@ -1,7 +1,7 @@
 <div class="container">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			{{template}}
+			{{path}}
 		</div>
 		<div class="panel-body">
 			<p>{{lang_templateAdminHelp}}</p>
@@ -24,12 +24,12 @@
 							<tr class="{{class}}" id="{{tag}}">
 								<td>{{tag}}</td>
 								{{#langs}}
-								<td style="text-align:center">
+								<td>
 									<input type="text" class="form-control" placeholder="{{placeholder}}" value="{{translation}}" name="lang#{{lang}}#{{tag}}">
 								</td>
 								{{/langs}}
-								<td style="text-align:center">
-									<a class="btn btn-danger btn-xs" href="?do=Translation&template={{template}}&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
+								<td>
+									<button type="submit" class="btn btn-danger btn-xs" name="delete" value="{{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</button>
 								</td>
 							</tr>
 						{{/tags}}
@@ -39,10 +39,9 @@
 				</table>
 				<a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a>
 				<button class="btn btn-primary" type="button" onclick="addTag()" >{{lang_createTag}}</button> 
-				<input type="hidden" name="update" value="true">
-				<input type="hidden" name="path" value="{{template}}">
+				<input type="hidden" name="path" value="{{path}}">
 				<input type="hidden" name="token" value="{{token}}">
-				<input type="submit" class="btn btn-primary" value="{{lang_save}}">
+				<button type="submit" class="btn btn-primary" name="update" value="true">{{lang_save}}</button>
 			</form>
 		</div>
 	</div>
diff --git a/templates/translation/messages.html b/templates/translation/messages.html
deleted file mode 100644
index c065c7f7..00000000
--- a/templates/translation/messages.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			{{lang_messages}}
-		</div>
-		<div class="panel-body">
-			<p>{{lang_templateMessagesHelp}}</p>
-			<div class="alert alert-info">
-				{{lang_templateHint}}
-			</div>
-		</div>
-		<form action="?do=Translation" method="post">
-			<table class="table table-hover">
-				<thead>
-					<tr>
-						<th>{{lang_messages}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_germanJSON}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_englishJSON}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_portugueseJSON}}</th>
-						<th style='width:100px;text-align:center;'></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#msgs}}
-						<tr>
-							<td>{{tag}}</td>
-							<td style='width:250px;text-align:center;'>
-								<input type="text" class="form-control" placeholder="{{lang_germanTAG}}" value="{{de}}" name="lang#de#{{tag}}">
-							</td>
-							<td style='width:250px;text-align:center;'>
-								<input type="text" class="form-control" placeholder="{{lang_englishTAG}}" value="{{en}}" name="lang#en#{{tag}}">
-							</td>
-							<td style='width:250px;text-align:center;'>
-								<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=Translation&template=messages&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
-							</td>
-						</tr>
-					{{/msgs}}
-					<tr id="newTag">
-					</tr>
-				</tbody>
-			</table>
-			<div class="panel-body">
-				<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_save}}">
-				</form>
-			</div>
-		<form action="?do=Translation" method="post">
-			<table class="table table-hover">
-				<thead>
-					<tr>
-						<th>{{lang_messagesHardcoded}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_germanJSON}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_englishJSON}}</th>
-						<th style='text-align:center;width:260px;'>{{lang_portugueseJSON}}</th>
-						<th style='width:100px;text-align:center;'></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#msgsHC}}
-						<tr>
-							<td>{{tag}}</td>
-							<td style='width:250px;text-align:center;'>
-								<input type="text" class="form-control" placeholder="{{lang_germanTAG}}" value="{{de}}" name="lang#de#{{tag}}">
-							</td>
-							<td style='width:250px;text-align:center;'>
-								<input type="text" class="form-control" placeholder="{{lang_englishTAG}}" value="{{en}}" name="lang#en#{{tag}}">
-							</td>
-							<td style='width:250px;text-align:center;'>
-								<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=Translation&template=messages-hardcoded&delete={{tag}}"><span class="glyphicon glyphicon-remove"></span> {{lang_deleteTAG}}</a>
-							</td>
-						</tr>
-					{{/msgsHC}}
-					<tr id="newTagCoded">
-					</tr>
-				</tbody>
-			</table>
-			<div class="panel-body">
-				<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_save}}">
-				</form>
-			</div>
-	</div>
-</div>
-<script>
-function addTag(isHardcoded){
-	var target;
-	if(isHardcoded)
-		target = document.getElementById('newTagCoded');
-	else
-		target = document.getElementById('newTag');
-	target.innerHTML = "<td> <input type='text' class='form-control' placeholder='{{lang_newTAG}}' name='newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_germanTAG}}' name='lang#de#newtag'> </td> <td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_englishTAG}}' name='lang#en#newtag'> </td>	<td style='width:250px;text-align:center;'> <input type='text' class='form-control' placeholder='{{lang_portugueseTAG}}' name='lang#pt#newtag'> </td>";
-}
-</script>
diff --git a/templates/translation/template-list.html b/templates/translation/template-list.html
new file mode 100644
index 00000000..1449cef0
--- /dev/null
+++ b/templates/translation/template-list.html
@@ -0,0 +1,33 @@
+<div class="container">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{{lang_langAdministration}}
+		</div>
+		<div class="panel-body">
+			<p>{{lang_adminInfo}}</p>
+		</div>
+	</div>
+	<div class="panel panel-default">
+		<table class="table table-hover">
+			<thead>
+				<tr>
+					<th>Template</th>
+					<th>{{lang_status}}</th>
+				<tr>
+			</thead>
+			<tbody>
+				{{#table}}
+					<tr onclick="goTo('{{link}}');">
+						<td>{{template}}</td>
+						<td>{{{status}}}</td>
+					</tr>
+				{{/table}}
+			</tbody>
+		</table>
+	</div>
+</div>
+<script>
+function goTo(link){
+	window.location.href = "?do=Translation&page=template&template=" + link;
+}
+</script>