2 files changed, 24 insertions, 20 deletions
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index 0cf53dcd3..dc6a5c3d3 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -64,29 +64,27 @@
         <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {general.ALLOW_USER_REGISTRATION} />
       </label>
     </li>
+  </ul>
+</fieldset>
+<!-- END general -->
 
-    <br/>
-    <li>
-      <fieldset>
-        <legend>{lang:History}</legend>
-        <ul>
-          <li>
-            <label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {general.LOG} /></label>
-          </li>
+<!-- BEGIN history -->
+<fieldset id="historyConf">
+  <ul>
+      <li>
+        <label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {history.LOG} /></label>
+      </li>
 
-          <li>
-            <label><span class="property">{lang:user_status_admin}</span><input type="checkbox" name="history_admin" {general.HISTORY_ADMIN} /></label>
-          </li>
+      <li>
+        <label><span class="property">{lang:user_status_admin}</span><input type="checkbox" name="history_admin" {history.HISTORY_ADMIN} /></label>
+      </li>
 
-          <li>
-            <label><span class="property">{lang:Guests}</span><input type="checkbox" name="history_guest" {general.HISTORY_GUEST} /></label>
-          </li>
-        </ul>
-      </fieldset>
-    </li>
+      <li>
+        <label><span class="property">{lang:Guests}</span><input type="checkbox" name="history_guest" {history.HISTORY_GUEST} /></label>
+      </li>
   </ul>
 </fieldset>
-<!-- END general -->
+<!-- END history -->
 
 <!-- BEGIN comments -->
 <fieldset id="commentsConf">
diff --git a/template/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 9d35a6bc4..319f172e4 100644
--- a/template/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
@@ -24,8 +24,8 @@
   <dd>
     <ul>
       <li>{lang:Operating system}: {OS}</li>
-      <li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>)</li>
-      <li>MySQL: {MYSQL_VERSION}</li>
+      <li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>)  [{PHP_DATATIME}]</li>
+      <li>MySQL: {MYSQL_VERSION} [{DB_DATATIME}]</li>
     </ul>
   </dd>
 
@@ -55,4 +55,10 @@
     </ul>
   </dd>
 
+  <dt>{lang:Clock}</dt>
+  <dd>
+    <ul>
+    </ul>
+  </dd>
+
 </dl>