Remove the H2 sub-headlines in the back end (see #7248)

contao · Sep 25, 2014 · bb5d9b1 · bb5d9b1
1 parent 800ed2d
commit bb5d9b1
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 52 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.4.0-beta1 (2014-10-XX)
 --------------------------------
 
+### Changed
+Removed the H2 sub-headlines in the back end (see #7248).
+
 ### Improved
 Only create one `DcaExtractor` instance per table (see #7324).
 

diff --git a/system/modules/core/classes/Backend.php b/system/modules/core/classes/Backend.php
@@ -562,15 +562,29 @@ protected function getBackendModule($module)
 			{
 				$this->Template->headline .= ' » ' . $GLOBALS['TL_LANG']['MSC']['all_override'][0];
 			}
-			elseif (is_array($GLOBALS['TL_LANG'][$strTable][$act]) && \Input::get('id'))
+			elseif (is_array($GLOBALS['TL_LANG'][$strTable][$act]))
 			{
-				if (\Input::get('do') == 'files')
+				if (\Input::get('id'))
 				{
-					$this->Template->headline .= ' » ' . \Input::get('id');
+					if (\Input::get('do') == 'files')
+					{
+						$this->Template->headline .= ' » ' . \Input::get('id');
+					}
+					else
+					{
+						$this->Template->headline .= ' » ' . sprintf($GLOBALS['TL_LANG'][$strTable][$act][1], \Input::get('id'));
+					}
 				}
-				else
+				elseif (\Input::get('pid'))
 				{
-					$this->Template->headline .= ' » ' . sprintf($GLOBALS['TL_LANG'][$strTable][$act][1], \Input::get('id'));
+					if (\Input::get('do') == 'files')
+					{
+						$this->Template->headline .= ' » ' . \Input::get('pid');
+					}
+					else
+					{
+						$this->Template->headline .= ' » ' . sprintf($GLOBALS['TL_LANG'][$strTable][$act][1], \Input::get('pid'));
+					}
 				}
 			}
 

diff --git a/system/modules/core/classes/StyleSheets.php b/system/modules/core/classes/StyleSheets.php
@@ -1308,8 +1308,6 @@ public function importStyleSheet()
 <div id="tl_buttons">
 <a href="' .ampersand(str_replace('&key=import', '', \Environment::get('request'))). '" class="header_back" title="' .specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']). '" accesskey="b">' .$GLOBALS['TL_LANG']['MSC']['backBT']. '</a>
 </div>
-
-<h2 class="sub_headline">' .$GLOBALS['TL_LANG']['tl_style_sheet']['import'][1]. '</h2>
 ' .\Message::generate(). '
 <form action="' .ampersand(\Environment::get('request'), true). '" id="tl_style_sheet_import" class="tl_form" method="post" enctype="multipart/form-data">
 <div class="tl_formbody_edit">

diff --git a/system/modules/core/classes/Theme.php b/system/modules/core/classes/Theme.php
@@ -119,8 +119,6 @@ public function importTheme()
 <div id="tl_buttons">
 <a href="'.ampersand(str_replace('&key=importTheme', '', \Environment::get('request'))).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_theme']['importTheme'][1].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_theme_import" class="tl_form" method="post" enctype="multipart/form-data">
 <div class="tl_formbody_edit">
@@ -159,8 +157,6 @@ protected function compareThemeFiles($arrFiles, $arrDbFields)
 <div id="tl_buttons">
 <a href="'.ampersand(str_replace('&key=importTheme', '', \Environment::get('request'))).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_theme']['checking_theme'].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_theme_import" class="tl_form" method="post">
 <div class="tl_formbody_edit">

diff --git a/system/modules/core/dca/tl_templates.php b/system/modules/core/dca/tl_templates.php
@@ -298,9 +298,7 @@ public function addNewTemplate()
 		return '
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
-</div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_templates']['headline'].'</h2>'.(($strError != '') ? '
+</div>'.(($strError != '') ? '
 
 <div class="tl_message">
 <p class="tl_error">'.$strError.'</p>

diff --git a/system/modules/core/drivers/DC_File.php b/system/modules/core/drivers/DC_File.php
@@ -323,8 +323,6 @@ public function edit()
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG'][$this->strTable]['edit'].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="'.$this->strTable.'" class="tl_form" method="post"'.(!empty($this->onsubmit) ? ' onsubmit="'.implode(' ', $this->onsubmit).'"' : '').'>
 

diff --git a/system/modules/core/drivers/DC_Folder.php b/system/modules/core/drivers/DC_Folder.php
@@ -999,8 +999,6 @@ public function move($blnIsAjax=false)
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.sprintf($GLOBALS['TL_LANG']['tl_files']['uploadFF'], basename($strFolder)).'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="'.$this->strTable.'" class="tl_form" method="post"'.(!empty($this->onsubmit) ? ' onsubmit="'.implode(' ', $this->onsubmit).'"' : '').' enctype="multipart/form-data">
 <div class="tl_formbody_edit">
@@ -1241,8 +1239,6 @@ public function edit()
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_files']['editFF'].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="'.$this->strTable.'" class="tl_form" method="post"'.(!empty($this->onsubmit) ? ' onsubmit="'.implode(' ', $this->onsubmit).'"' : '').'>
 <div class="tl_formbody_edit">
@@ -1829,8 +1825,6 @@ public function source()
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.sprintf($GLOBALS['TL_LANG']['tl_files']['editFile'], $objFile->basename).'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_files" class="tl_form" method="post">
 <div class="tl_formbody_edit">
@@ -2151,8 +2145,6 @@ public function sync()
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_files']['sync'][1].'</h2>
 '.\Message::generate().'
 <div id="sync-results">
   <p class="left">' . sprintf($GLOBALS['TL_LANG']['tl_files']['syncResult'], \System::getFormattedNumber($arrCounts['Added'], 0), \System::getFormattedNumber($arrCounts['Changed'], 0), \System::getFormattedNumber($arrCounts['Unchanged'], 0), \System::getFormattedNumber($arrCounts['Moved'], 0), \System::getFormattedNumber($arrCounts['Deleted'], 0)) . '</p>

diff --git a/system/modules/core/drivers/DC_Table.php b/system/modules/core/drivers/DC_Table.php
@@ -606,8 +606,6 @@ public function show()
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>' : '') . '
 </div>
 
-<h2 class="sub_headline">'.sprintf($GLOBALS['TL_LANG']['MSC']['showRecord'], ($this->intId ? 'ID '.$this->intId : '')).'</h2>
-
 <table class="tl_show">'.$return.'
 </table>';
 	}
@@ -1971,8 +1969,6 @@ public function edit($intID=null, $ajaxId=null)
 <div id="tl_buttons">' . (\Input::get('nb') ? '&nbsp;' : '
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b" onclick="Backend.getScrollOffset()">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>') . '
 </div>
-
-<h2 class="sub_headline">'.sprintf($GLOBALS['TL_LANG']['MSC']['editRecord'], ($this->intId ? 'ID '.$this->intId : '')).'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="'.$this->strTable.'" class="tl_form" method="post" enctype="' . ($this->blnUploadable ? 'multipart/form-data' : 'application/x-www-form-urlencoded') . '"'.(!empty($this->onsubmit) ? ' onsubmit="'.implode(' ', $this->onsubmit).'"' : '').'>
 <div class="tl_formbody_edit">

diff --git a/system/modules/core/languages/en/tl_content.xlf b/system/modules/core/languages/en/tl_content.xlf
@@ -590,6 +590,12 @@
       <trans-unit id="tl_content.editarticle.1">
         <source>Edit article ID %s</source>
       </trans-unit>
+      <trans-unit id="tl_content.list.1">
+        <source>Import list items from a CSV file</source>
+      </trans-unit>
+      <trans-unit id="tl_content.table.1">
+        <source>Import table items from a CSV file</source>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/system/modules/core/templates/backend/be_welcome.html5 b/system/modules/core/templates/backend/be_welcome.html5
@@ -1,6 +1,4 @@
 
-<h1 id="tl_welcome"><?php echo $this->welcome; ?></h1>
-
 <div id="tl_soverview">
 
   <?php if (!empty($this->messages)): ?>

diff --git a/system/modules/core/widgets/ListWizard.php b/system/modules/core/widgets/ListWizard.php
@@ -240,8 +240,6 @@ public function importList(\DataContainer $dc)
 <div id="tl_buttons">
 <a href="'.ampersand(str_replace('&key=list', '', \Environment::get('request'))).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['MSC']['lw_import'][1].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_list_import" class="tl_form" method="post" enctype="multipart/form-data">
 <div class="tl_formbody_edit">

diff --git a/system/modules/core/widgets/TableWizard.php b/system/modules/core/widgets/TableWizard.php
@@ -321,8 +321,6 @@ public function importTable(\DataContainer $dc)
 <div id="tl_buttons">
 <a href="'.ampersand(str_replace('&key=table', '', \Environment::get('request'))).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['MSC']['tw_import'][1].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_table_import" class="tl_form" method="post" enctype="multipart/form-data">
 <div class="tl_formbody_edit">

diff --git a/system/modules/newsletter/classes/Newsletter.php b/system/modules/newsletter/classes/Newsletter.php
@@ -230,8 +230,6 @@ public function send(\DataContainer $objDc)
 <div id="tl_buttons">
 <a href="'.$this->getReferer(true).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.sprintf($GLOBALS['TL_LANG']['tl_newsletter']['send'][1], $objNewsletter->id).'</h2>
 '.\Message::generate().'
 <form action="'.TL_SCRIPT.'" id="tl_newsletter_send" class="tl_form" method="get">
 <div class="tl_formbody_edit tl_newsletter_send">
@@ -533,8 +531,6 @@ public function importRecipients()
 <div id="tl_buttons">
 <a href="'.ampersand(str_replace('&key=import', '', \Environment::get('request'))).'" class="header_back" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['backBTTitle']).'" accesskey="b">'.$GLOBALS['TL_LANG']['MSC']['backBT'].'</a>
 </div>
-
-<h2 class="sub_headline">'.$GLOBALS['TL_LANG']['tl_newsletter_recipients']['import'][1].'</h2>
 '.\Message::generate().'
 <form action="'.ampersand(\Environment::get('request'), true).'" id="tl_recipients_import" class="tl_form" method="post" enctype="multipart/form-data">
 <div class="tl_formbody_edit">

diff --git a/system/themes/default/fonts.css b/system/themes/default/fonts.css
diff --git a/system/themes/default/main.css b/system/themes/default/main.css
diff --git a/system/themes/default/src/fonts.css b/system/themes/default/src/fonts.css
@@ -23,8 +23,8 @@
 #paste_hint p {
 	position:absolute;
 	font-family:"Architects Daughter",cursive;
-	font-size:15px;
-	font-size:.9375rem;
+	font-size:12px;
+	font-size:.75rem;
 	color:#838990;
 	top:10px;
 	right:30px;
@@ -42,8 +42,8 @@
 .sort_hint {
 	position:absolute;
 	font-family:"Architects Daughter",cursive;
-	font-size:15px;
-	font-size:.9375rem;
+	font-size:12px;
+	font-size:.75rem;
 	color:#838990;
 	top:-48px;
 	left:300px;

diff --git a/system/themes/default/src/main.css b/system/themes/default/src/main.css
@@ -499,7 +499,7 @@ input[type=search]::-webkit-search-decoration {
 }
 .tl_show {
 	width:705px;
-	margin:0 18px 18px;
+	margin:3px 18px 18px;
 	padding:9px 0 18px;
 }
 .tl_bg {
@@ -1372,6 +1372,9 @@ label.error,legend.error {
 	font-size:10px;
 	font-size:.625rem;
 }
+.tl_formbody_edit > .tl_error {
+	margin-top:18px;
+}
 
 /* Fieldsets */
 fieldset.tl_tbox {

diff --git a/system/themes/flexible/fonts.css b/system/themes/flexible/fonts.css
diff --git a/system/themes/flexible/main.css b/system/themes/flexible/main.css
diff --git a/system/themes/flexible/src/fonts.css b/system/themes/flexible/src/fonts.css
@@ -23,8 +23,8 @@
 #paste_hint p {
 	position:absolute;
 	font-family:"Architects Daughter",cursive;
-	font-size:15px;
-	font-size:.9375rem;
+	font-size:12px;
+	font-size:.75rem;
 	color:#838990;
 	top:10px;
 	right:30px;
@@ -42,8 +42,8 @@
 .sort_hint {
 	position:absolute;
 	font-family:"Architects Daughter",cursive;
-	font-size:15px;
-	font-size:.9375rem;
+	font-size:12px;
+	font-size:.75rem;
 	color:#838990;
 	top:-48px;
 	left:300px;

diff --git a/system/themes/flexible/src/main.css b/system/themes/flexible/src/main.css
@@ -506,7 +506,7 @@ input[type=search]::-webkit-search-decoration {
 }
 .tl_show {
 	width:705px;
-	margin:0 18px 18px;
+	margin:3px 18px 18px;
 	padding:9px 0 18px;
 }
 .tl_bg {
@@ -1381,6 +1381,9 @@ label.error,legend.error {
 	font-size:10px;
 	font-size:.625rem;
 }
+.tl_formbody_edit > .tl_error {
+	margin-top:18px;
+}
 
 /* Fieldsets */
 fieldset.tl_tbox {