add cat_name to root page

labby · Sep 26, 2017 · d352ceb · d352ceb
1 parent 1a06db1
commit d352ceb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/css/frontend.css b/css/frontend.css
@@ -40,21 +40,31 @@ body {
 	display: none;
 }
 
-.view_title {
+.gallerytitle {
     display: block;
     font-size: 150%;
     font-weight: bold;
 }
 
+.view_title {
+    display: block;
+    font-size: 100%;
+    font-weight: bold;
+}
+
 .categories_title {
-	font-size: 110%;
+    display: block;
+    font-size: 90%;
+    font-style: italic;
+    line-height: 45px;
+}
+
+.categories_desc {
+	font-size: 80%;
 	font-style: Italic;
 	line-height: 45px;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-	ADDS BY PUMPI
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 ul.photostyle {
 	list-style: none;

diff --git a/info.php b/info.php
@@ -33,7 +33,7 @@
 $module_directory	= 'foldergallery_jq';
 $module_name		= 'Foldergallery-jQuery';
 $module_function	= 'page';
-$module_version		= '2.3.1';
+$module_version		= '2.3.2';
 $module_platform	= '3.x';
 $module_author		= 'Jürg Rast, schliffer, Bianka Martinovic, Chio, Pumpi, Aldus, erpe';
 $module_license		= 'GNU General Public License';

diff --git a/templates/view_responsive.htt b/templates/view_responsive.htt
@@ -11,8 +11,10 @@
 
 
 <div class="gallery">
-  <div class="gallerytitel">
-    <span class="view_title">{VIEW_TITLE}&nbsp;{CATEGORIES_TITLE}</span>&nbsp;<span class="categories_title">{CAT_DESCRIPTION}&nbsp;</span>
+  <div class="gallerytitle">
+    <span class="view_title">{VIEW_TITLE}</span>
+	<span class="categories_title">{CATEGORIES_TITLE}</span>
+	<span class="categories_desc">{CAT_DESCRIPTION}</span>
   </div>
 </div>
 <div class="pagenav" style="text-align: left">{CATBREAD}</div>

diff --git a/view.php b/view.php
@@ -90,6 +90,7 @@
 	{
 		$p = '';    // Siehe #1; Eingangsseite
 		$sRootDescription = $ergebnis['description'];
+		$sRootTitle = $ergebnis['cat_name'];
 	}
 
 	if ($p == $aktuelleKat)
@@ -205,7 +206,7 @@
 	$sql = 'SELECT * FROM '.TABLE_PREFIX.'mod_foldergallery_jq_categories  WHERE section_id='.$section_id.' AND categorie="'.$bildkat.'" AND parent="'.$bildparent.'" LIMIT 1;';
 	$query = $database->query($sql);
 	$result = $query->fetchRow();
-	$titel = $result['cat_name'];
+	$cat_title = $result['cat_name'];
 	$description = $result['description'];
 
 	if(!empty($result['categorie'])) $folder = $root_dir.$result['parent'].'/'.$result['categorie'].'/';
@@ -244,8 +245,6 @@
 	$t = new Template(dirname(__FILE__).'/templates', 'remove');
 }
 
-// --- commented by WebBird, 29.07.2010 ---
-//$t = new Template(dirname(__FILE__).'/templates', 'remove');
 $t->halt_on_error = 'no';
 $t->set_file('view', $viewTemplate);
 $t->set_block('view', 'CommentDoc'); $t->clear_var('CommentDoc');
@@ -306,10 +305,8 @@
                 ? $_GET['p']
                 : 1;
 
-	$t->set_var('CAT_TITLE', $titel);
-
-	$t->set_var('CAT_DESCRIPTION', ($bIsRootPage === true ? $sRootDescription : $description ) );
-
+	$t->set_var('CAT_TITLE', $cat_title);  // 20170926     not clear where this is used, CAT_TITLE should be only in backend
+	$t->set_var('CAT_DESCRIPTION', $description );
 
 	if ( is_numeric( $pages ) ) {
 	      	$pages_navi = '<ul class="fg_pages_nav">';
@@ -382,7 +379,7 @@
 
     $t->clear_var('thumbnails');
     $t->clear_var('images');
-
+    $t->set_var('CATEGORIES_TITLE', ($bIsRootPage === true ? $sRootTitle : $cat_title ) );
     $t->set_var('CAT_DESCRIPTION', ($bIsRootPage === true ? $sRootDescription : $description ) );
 }
 
@@ -411,7 +408,7 @@
                .  $link
                .  '?cat=/'.implode('/', array_slice( $path, 0, ($i+1) ) )
                .  '">'.$cat['cat_name'].'</a></li>';
-    }
+	}
 
     $bread .= '</ul><br /><br />';
     $t->set_var( 'CATBREAD', $bread );