#884 Remove double page title

GetLuna · Aug 24, 2014 · 68a7416 · 68a7416
1 parent 305dd4a
commit 68a7416
Show file tree

Hide file tree

Showing 21 changed files with 3 additions and 57 deletions.
diff --git a/backstage/appearance.php b/backstage/appearance.php
@@ -87,9 +87,6 @@
 require FORUM_ROOT.'backstage/header.php';
 generate_admin_menu('settings', 'appearance');
 
-?>
-<h2><?php echo $lang['Appearance'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/bans.php b/backstage/bans.php
@@ -102,7 +102,6 @@
 	generate_admin_menu('users', 'bans');
 
 ?>
-<h2><?php echo $lang['Ban advanced head'] ?></h2>
 <form class="form-horizontal" id="bans2" method="post" action="bans.php">
     <div class="panel panel-default">
         <div class="panel-heading">
@@ -375,7 +374,6 @@
 	generate_admin_menu('users', 'bans');
 
 ?>
-<h2><?php echo $lang['Bans'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
@@ -447,7 +445,6 @@
 	generate_admin_menu('users', 'bans');
 
 ?>
-<h2><?php echo $lang['Bans'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['New ban head'] ?></h3>

diff --git a/backstage/board.php b/backstage/board.php
@@ -84,7 +84,6 @@
 	generate_admin_menu('content', 'board');
 
 ?>
-<h2><?php echo $lang['Confirm delete head'] ?></h2>
 <form method="post" action="board.php?del_forum=<?php echo $forum_id ?>">
 	<fieldset>
     	<div class="panel panel-danger">
@@ -206,7 +205,6 @@
 	generate_admin_menu('content', 'board');
 
 ?>
-<h2><?php echo $lang['Forum settings'] ?></h2>
 <form id="edit_forum" class="form-horizontal" method="post" action="board.php?edit_forum=<?php echo $forum_id ?>">
     <div class="panel panel-default">
         <div class="panel-heading">
@@ -403,7 +401,6 @@
 	generate_admin_menu('content', 'board');
 
 ?>
-<h2><?php echo $lang['Confirm delete cat head'] ?></h2>
 <form method="post" action="board.php">
     <input type="hidden" name="cat_to_delete" value="<?php echo $cat_to_delete ?>" />
     <fieldset>
@@ -463,9 +460,6 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('content', 'board');
 
-?>
-<h2><?php echo $lang['Board structure'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/censoring.php b/backstage/censoring.php
@@ -91,7 +91,6 @@
 	generate_admin_menu('content', 'censoring');
 
 ?>
-<h2><?php echo $lang['Censoring'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Add word subhead'] ?></h3>

diff --git a/backstage/css/style.css b/backstage/css/style.css
@@ -94,7 +94,7 @@ label .help-block {
 	background: linear-gradient(to right, #0d4382 0%, #3588e9 100%);
 	padding-top: 0;
 	padding-bottom: 0;
-	margin-bottom: 0;
+	margin-bottom: 30px;
 }
 
 .jumboheader h2 {

diff --git a/backstage/database.php b/backstage/database.php
@@ -667,7 +667,6 @@ function split_sql_file($sql, $delimiter)
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('database');
 ?>
-<h2><?php echo $lang['Database'] ?></h2>
 <form class="form-horizontal" method="post" action="<?php echo $_SERVER['REQUEST_URI'] ?>">
     <div class="panel panel-default">
         <div class="panel-heading">

diff --git a/backstage/email.php b/backstage/email.php
@@ -75,9 +75,6 @@
 require FORUM_ROOT.'backstage/header.php';
 generate_admin_menu('settings', 'email');
 
-?>
-<h2><?php echo $lang['Email'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/features.php b/backstage/features.php
@@ -77,9 +77,6 @@
 require FORUM_ROOT.'backstage/header.php';
 generate_admin_menu('settings', 'features');
 
-?>
-<h2><?php echo $lang['Features'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/groups.php b/backstage/groups.php
@@ -54,7 +54,6 @@
 	require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('users', 'groups');
 ?>
-<h2><?php echo $lang['Group settings head'] ?></h2>
 <form class="form-horizontal" id="groups2" method="post" action="groups.php" onsubmit="return process_form(this)">
     <div class="panel panel-default">
         <div class="panel-heading">
@@ -459,7 +458,6 @@
 	generate_admin_menu('users', 'groups');
 
 ?>
-<h2><?php echo $lang['Group delete head'] ?></h2>
 <form method="post" action="groups.php?del_group=<?php echo $group_id ?>">
     <div class="panel panel-danger">
         <div class="panel-heading">
@@ -533,7 +531,6 @@
 	generate_admin_menu('users', 'groups');
 
 ?>
-<h2><?php echo $lang['Groups'] ?></h2>
 <div class="row">
     <div class="col-sm-6">
         <div class="panel panel-default">

diff --git a/backstage/index.php b/backstage/index.php
@@ -61,8 +61,6 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('backstage', 'index');
 ?>
-
-<h2><?php echo $lang['Backstage'] ?><span class="pull-right"><a href="update.php" class="btn btn-default btn-update"><?php echo $lang['Updates'] ?></a></span></h2>
 <div class="row">
 <?php
 //Update checking

diff --git a/backstage/maintenance.php b/backstage/maintenance.php
@@ -214,7 +214,6 @@
 	generate_admin_menu('settings', 'maintenance');
 
 ?>
-<h2><?php echo $lang['Maintenance'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Prune'] ?></h3>
@@ -356,9 +355,6 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('settings', 'maintenance');
 
-?>
-<h2><?php echo $lang['Maintenance'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>';
 if (isset($_GET['cache_cleared']))

diff --git a/backstage/permissions.php b/backstage/permissions.php
@@ -64,9 +64,6 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('users', 'permissions');
 
-?>
-<h2><?php echo $lang['Permissions'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/ranks.php b/backstage/ranks.php
@@ -102,9 +102,8 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('users', 'ranks');
 
+if ($luna_config['o_ranks'] == 0) {
 ?>
-<h2><?php echo $lang['Ranks'] ?></h2>
-<?php if ($luna_config['o_ranks'] == 0) { ?>
 <div class="alert alert-danger">
 	<?php echo sprintf($lang['Ranks disabled'], '<a href="features.php">'.$lang['Features'].'</a>') ?>
 </div>

diff --git a/backstage/registration.php b/backstage/registration.php
@@ -73,9 +73,6 @@
 require FORUM_ROOT.'backstage/header.php';
 generate_admin_menu('settings', 'registration');
 
-?>
-<h2><?php echo $lang['Registration'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/reports.php b/backstage/reports.php
@@ -53,7 +53,6 @@
 	generate_admin_menu('content', 'reports');
 
 ?>
-<h2><?php echo $lang['Reports'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['New reports head'] ?></h3>

diff --git a/backstage/settings.php b/backstage/settings.php
@@ -146,9 +146,6 @@
 require FORUM_ROOT.'backstage/header.php';
 generate_admin_menu('settings', 'settings');
 
-?>
-<h2><?php echo $lang['Options head'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/statistics.php b/backstage/statistics.php
@@ -102,7 +102,6 @@
 	generate_admin_menu('backstage', 'stats');
 
 ?>
-<h2><?php echo $lang['Server statistics head'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Server statistics head'] ?></h3>

diff --git a/backstage/theme.php b/backstage/theme.php
@@ -50,9 +50,6 @@
 require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('settings', 'theme');
 
-?>
-<h2><?php echo $lang['Style'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>'
 ?>

diff --git a/backstage/update.php b/backstage/update.php
@@ -81,7 +81,6 @@
 	generate_admin_menu('backstage', 'update');
 
 	?>
-<h2><?php echo $lang['ModernBB software updates'] ?></h2>
 <div class="panel panel-default">
 	<div class="panel-heading">
     	<h3 class="panel-title"><?php echo $lang['ModernBB updates'] ?><span class="pull-right"><a href="update.php?action=check_update" class="btn btn-primary"><?php echo $lang['Check for updates'] ?></a></span></h3>

diff --git a/backstage/users.php b/backstage/users.php
@@ -138,7 +138,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Users'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
@@ -221,7 +220,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Users'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
@@ -405,7 +403,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Move users'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Move users'] ?></h3>
@@ -555,7 +552,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Users'] ?></h2>
 <form name="confirm_del_users" method="post" action="users.php">
     <div class="panel panel-danger">
         <div class="panel-heading">
@@ -681,7 +677,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Users'] ?></h2>
 <form id="bans2" class="form-horizontal" name="confirm_ban_users" method="post" action="users.php">
 	<div class="panel panel-default">
 		<div class="panel-heading">
@@ -866,7 +861,6 @@
 	generate_admin_menu('users', 'users');
 
 ?>
-<h2><?php echo $lang['Users'] ?></h2>
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $lang['Results head'] ?></h3>
@@ -973,9 +967,6 @@
 	require FORUM_ROOT.'backstage/header.php';
 	generate_admin_menu('users', 'users');
 
-?>
-<h2><?php echo $lang['Users'] ?></h2>
-<?php
 if (isset($_GET['saved']))
 	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>';
 if (isset($_GET['deleted']))

diff --git a/include/version.php b/include/version.php
@@ -12,7 +12,7 @@ class Version
 	const FORUM_VERSION = '3.5-dev';
 
 	// The ModernBB Core version
-	const FORUM_CORE_VERSION = '0.0.40.2914';
+	const FORUM_CORE_VERSION = '0.0.40.2915';
 
 	// The database version number, every change in the database requires this number to go one up
 	const FORUM_DB_VERSION = 77;