From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/themes/default/templates/tabbed_form.tpl.htm |  111 ++++++++++++++++++++-----------------------------------
 1 files changed, 41 insertions(+), 70 deletions(-)

diff --git a/interface/web/themes/default/templates/tabbed_form.tpl.htm b/interface/web/themes/default/templates/tabbed_form.tpl.htm
index 60a4ff8..5a50003 100644
--- a/interface/web/themes/default/templates/tabbed_form.tpl.htm
+++ b/interface/web/themes/default/templates/tabbed_form.tpl.htm
@@ -1,70 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>42go Form</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="../themes/{tmpl_var name="theme"}/style.css" rel="stylesheet" type="text/css">
-<script language="JavaScript">
-<!--
-function changeTab(tab) {
-	document.myform.next_tab.value = tab;
-	document.myform.submit();
-}
-
-//-->
-</script>
-</head>
-
-<body>
-<form method="post" action="<tmpl_var name='form_action'>" name="myform" enctype="multipart/form-data">
-<table width="100%" border="0" cellspacing="0" cellpadding="2">
-  <tmpl_if name="form_hint">
-  <tr>
-    <td class="frmText11"><tmpl_var name="form_hint"></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr>
-	    <td width="2" class="frmTab">&nbsp;</td>
-		<tmpl_loop name="formTab">
-		<tmpl_if name="active">
-        <td width="<tmpl_var name='width'>" align="center" class="frmTabSelected"><a href="javascript:changeTab('<tmpl_var name='name'>')" class="frmText11"><tmpl_var name='title'></a></td>
-        <td width="2" class="frmTab">&nbsp;</td>
-		<tmpl_else>
-        <td width="<tmpl_var name='width'>" class="frmTabDefault"><a href="javascript:changeTab('<tmpl_var name='name'>')" class="frmText11"><tmpl_var name='title'></a></td>
-        <td width="2" class="frmTab">&nbsp;</td>
-		</tmpl_if>
-		</tmpl_loop>
-        <td class="frmTab">&nbsp;</td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tmpl_if name="error">
-  <tr>
-    <td class="error"><tmpl_var name="error"></td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td>
-		<tmpl_dyninclude name="content_tpl">
-	</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td class="tblFooter">&nbsp;</td>
-  </tr>
-</table>
-<input type="hidden" name="next_tab" value="">
-<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
-</form>
-</body>
-</html>
\ No newline at end of file
+	<tmpl_if name="form_hint">
+		<div class='page-header'>
+		  <h1><tmpl_var name="form_hint"></h1>
+		</div>
+	</tmpl_if>
+	<tmpl_if name="msg">
+		<div class='alert alert-notification'>
+		  <tmpl_var name="msg">
+		</div>
+	</tmpl_if>
+	<tmpl_if name="error">
+		<div class='alert alert-danger clear'>
+		  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
+		  <div class='alert-content'>
+			<ol><tmpl_var name="error"></ol>
+		  </div>
+		</div>
+	</tmpl_if>
+	
+	<!-- content in tabs -->
+	<div class='content-tab-wrapper'>
+		<!-- tabs -->
+		<ul class='nav nav-tabs'>
+		<tmpl_loop name="formTab">
+			<li<tmpl_if name="active"> class='active'</tmpl_if>>
+				<a href='#' onclick="return ISPConfig.changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a>
+			</li>
+        </tmpl_loop>
+		</ul>
+
+		<div id="tabbox_content" class="tab-content">
+			<div class='tab-pane active fade in'>
+			<tmpl_dyninclude name="content_tpl">
+			</div>
+		</div>
+
+		<input type="hidden" name="_csrf_id" value="{tmpl_var name='_csrf_id'}" />
+		<input type="hidden" name="_csrf_key" value="{tmpl_var name='_csrf_key'}" />
+		<input type="hidden" name="next_tab" value="">
+		<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
+	</div>

--
Gitblit v1.9.1