captive: Group settings together and create branding section

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index b6175673e1be427eeb14d7fe6b0c1b79cfe34763..e7081e96ba87cf282678a11d844f8c4baa80ff91 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -266,20 +266,8 @@ END
                print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourblue'>Blue</font></td><td><input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /></td></tr>";
        }
 
-       print<<END
-               </tr>
-               <tr>
-                       <td>
-                               $Lang::tr{'Captive title'}
-                       </td>
-                       <td>
-                               <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
-                       </td>
-               </tr>
-END
-;
-
 print<<END
+               </tr>
                <tr>
                        <td>
                                $Lang::tr{'Captive authentication'}
@@ -314,6 +302,29 @@ END
 END
        }
 
+       print<<END;
+               <tr>
+                       <td colspan="2">
+                               <br>
+                               <strong>$Lang::tr{'Captive branding'}</strong>
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               $Lang::tr{'Captive title'}
+                       </td>
+                       <td>
+                               <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
+                       </td>
+               </tr>
+               <tr>
+                       <td>$Lang::tr{'Captive brand color'}</td>
+                       <td>
+                               <input type="color" name="COLOR" value="$settings{'COLOR'}">
+                       </td>
+               </tr>
+END
+
        #Logo Upload
        print <<END;
                <tr>
@@ -337,24 +348,16 @@ END
                print"<td><br>$Lang::tr{'no'}</td></tr>";
        }
 
-print<<END
-               <tr>
-                       <td>$Lang::tr{'Captive brand color'}</td>
-                       <td>
-                               <input type="color" name="COLOR" value="$settings{'COLOR'}">
-                       </td>
-               </tr>
-
+       print <<END;
                <tr>
                        <td></td>
                        <td align='right'>
                                <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
                        </td>
                </tr>
-       </table>
-</form>
+       </table></form>
 END
-;
+
        &Header::closebox();
 
        #if settings is set to use coupons, the coupon part has to be displayed

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 58475ab28edebe9ac0f3289b3dd18e10d5606291..cde2a2f8cffda9e47fc1f85e4388a758ffd02c37 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -23,6 +23,7 @@
 'Captive config' => 'Settings',
 'Captive coupon' => 'Coupon',
 'Captive err doublevoucher' => 'A voucher with this code already exists',
+'Captive branding' => 'Branding',
 'Captive expire' => 'Expire',
 'Captive generate coupon' => 'Generate Coupon',
 'Captive heading terms' => 'Terms & Conditions',