Site name, site slogan, tweakings

NellielProject · Feb 9, 2019 · b58e2be · b58e2be
1 parent 9d5a19b
commit b58e2be
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 59 deletions.
diff --git a/assets/styles/burichan/burichan.css b/assets/styles/burichan/burichan.css
@@ -56,6 +56,18 @@ form {
     clear: both;
 }
 
+.site-name {
+	font-size: 2.0rem;
+	font-weight: bold;
+    text-align: center;
+    clear: both;
+}
+
+.site-slogan {
+    text-align: center;
+    clear: both;
+}
+
 .board-banner {
     text-align: center;
     clear: both;

diff --git a/assets/styles/futaba/futaba.css b/assets/styles/futaba/futaba.css
@@ -53,6 +53,18 @@ form {
     clear: both;
 }
 
+.site-name {
+	font-size: 2.0rem;
+	font-weight: bold;
+    text-align: center;
+    clear: both;
+}
+
+.site-slogan {
+    text-align: center;
+    clear: both;
+}
+
 .board-banner {
     text-align: center;
     clear: both;

diff --git a/assets/styles/nelliel/nelliel.css b/assets/styles/nelliel/nelliel.css
@@ -48,6 +48,18 @@ form {
     padding-bottom: 6px;
 }
 
+.site-name {
+	font-size: 2.0rem;
+	font-weight: bold;
+    text-align: center;
+    clear: both;
+}
+
+.site-slogan {
+    text-align: center;
+    clear: both;
+}
+
 .site-banner {
     text-align: center;
     clear: both;

diff --git a/assets/styles/nelliel_b/nelliel_b.css b/assets/styles/nelliel_b/nelliel_b.css
@@ -53,6 +53,18 @@ form {
     clear: both;
 }
 
+.site-name {
+	font-size: 2.0rem;
+	font-weight: bold;
+    text-align: center;
+    clear: both;
+}
+
+.site-slogan {
+    text-align: center;
+    clear: both;
+}
+
 .board-banner {
     text-align: center;
     clear: both;

diff --git a/assets/styles/nigra/nigra.css b/assets/styles/nigra/nigra.css
@@ -53,6 +53,18 @@ form {
     clear: both;
 }
 
+.site-name {
+	font-size: 2.0rem;
+	font-weight: bold;
+    text-align: center;
+    clear: both;
+}
+
+.site-slogan {
+    text-align: center;
+    clear: both;
+}
+
 .board-banner {
     text-align: center;
     clear: both;

diff --git a/board_files/include/Setup/TableSiteConfig.php b/board_files/include/Setup/TableSiteConfig.php
@@ -67,10 +67,10 @@ public function insertDefaults()
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'language', 'en-US', 0]);
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'recaptcha_site_key', '', 0]);
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'recaptcha_sekrit_key', '', 0]);
+        $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'site_name', '', 0]);
+        $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'site_slogan', '', 0]);
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'site_favicon', '', 0]);
-        $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'boolean', 'show_site_favicon', '0', 0]);
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'string', 'site_banner', '', 0]);
-        $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'boolean', 'show_site_banner', '0', 0]);
         $this->insertDefaultRow(['core_setting', 'nelliel', 'general', 'boolean', 'display_render_timer', '1', 0]);
     }
 }
diff --git a/board_files/include/output/header.php b/board_files/include/output/header.php
@@ -66,33 +66,18 @@ function nel_render_board_header(\Nelliel\Domain $domain, $dotdot = null, $treel
     $board_banner = $dom->getElementById('top-board-banner');
     $favicon = $dom->getElementById('favicon-link');
 
-    if ($site_domain->setting('show_site_favicon') || $domain->setting('show_board_favicon'))
+    if ($domain->setting('show_board_favicon'))
     {
-        if ($site_domain->setting('show_site_favicon'))
-        {
-            $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
-        }
-
-        if ($domain->setting('show_board_favicon'))
-        {
-            $favicon->extSetAttribute('href', $domain->setting('board_favicon'));
-        }
+        $favicon->extSetAttribute('href', $domain->setting('board_favicon'));
     }
     else
     {
-        $favicon->remove();
+        $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
     }
 
-    $site_banner = $dom->getElementById('top-site-banner');
-
-    if ($site_domain->setting('show_site_banner'))
-    {
-        $site_banner->extSetAttribute('src', $site_domain->setting('site_banner'));
-    }
-    else
-    {
-        $site_banner->remove();
-    }
+    $top_site_name = $dom->getElementById('top-site-name')->remove();
+    $top_site_slogan = $dom->getElementById('top-site-slogan')->remove();
+    $top_site_banner = $dom->getElementById('top-site-banner')->remove();
 
     if ($domain->setting('show_board_banner'))
     {
@@ -168,29 +153,30 @@ function nel_render_general_header(\Nelliel\Domain $domain, $dotdot = null, $ext
     $dom->getElementById('js-style-set')->setContent('setStyle(nelliel.core.getCookie("style-' . $domain->id() . '"));');
     $dom->getElementById('top-board-banner')->remove();
     $dom->getElementById('top-board-title')->remove();
-    $dom->getElementById('top-site-banner')->remove();
 
     $favicon = $dom->getElementById('favicon-link');
+    $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
 
-    if ($site_domain->setting('show_site_favicon') || $domain->setting('show_board_favicon'))
-    {
-        if ($site_domain->setting('show_site_favicon'))
-        {
-            $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
-        }
+    $top_site_name = $dom->getElementById('top-site-name');
+    $top_site_slogan = $dom->getElementById('top-site-slogan');
+    $top_site_banner = $dom->getElementById('top-site-banner');
 
-        if ($domain->setting('show_board_favicon'))
-        {
-            $favicon->extSetAttribute('href', $domain->setting('board_favicon'));
-        }
+    if(isset($extra_data['use_site_titles']) && $extra_data['use_site_titles'])
+    {
+        $top_site_name->setContent($site_domain->setting('site_name'));
+        $top_site_slogan->setContent($site_domain->setting('site_slogan'));
+        $top_site_banner->extSetAttribute('src', $site_domain->setting('site_banner'));
     }
     else
     {
-        $favicon->remove();
+        $top_site_name->remove();
+        $top_site_slogan->remove();
+        $top_site_banner->remove();
     }
 
     $title_element = $head_element->getElementsByTagName('title')->item(0);
     $title_element->setContent('Nelliel Imageboard');
+
     $top_nav_menu = $dom->getElementById('top-nav-menu');
     $top_nav_menu_nodes = $top_nav_menu->getElementsByAttributeName('data-parse-id', true);
     $top_nav_menu_nodes['home']->extSetAttribute('href', $site_domain->setting('home_page'));
@@ -207,7 +193,7 @@ function nel_render_general_header(\Nelliel\Domain $domain, $dotdot = null, $ext
 
     $top_nav_menu_nodes['about-nelliel']->extSetAttribute('href', $dotdot . MAIN_SCRIPT . '?about_nelliel');
 
-    if (($session->isActive() || $session->inModmode($domain->id())))
+    if (($session->isActive() || $session->inModmode($domain->id())) && !$domain->renderActive())
     {
         if (isset($extra_data['header']))
         {
@@ -262,22 +248,11 @@ function nel_render_simple_header(\Nelliel\Domain $domain, $dotdot = null)
             $dotdot . STYLES_WEB_PATH . $style_info['directory'] . '/' . $style_info['main_file']);
     $head_element->appendChild($style_link);
 
-    $site_banner = $dom->getElementById('top-site-banner');
-
-    if ($site_domain->setting('show_site_banner'))
-    {
-        $site_banner->extSetAttribute('src', $site_domain->setting('site_banner'));
-    }
-    else
-    {
-        $site_banner->remove();
-    }
-
     $favicon = $dom->getElementById('favicon-link');
 
     if ($site_domain->setting('show_site_favicon'))
     {
-            $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
+        $favicon->extSetAttribute('href', $site_domain->setting('site_favicon'));
     }
     else
     {

diff --git a/board_files/include/output/news.php b/board_files/include/output/news.php
@@ -11,8 +11,9 @@ function nel_render_news()
     $domain = new \Nelliel\DomainSite(new \Nelliel\CacheHandler(), nel_database());
     $translator = new \Nelliel\Language\Translator();
     $file_handler = new \Nelliel\FileHandler();
+    $domain->renderActive(true);
     $domain->renderInstance()->startRenderTimer();
-    nel_render_simple_header($domain);
+    nel_render_general_header($domain, null, ['use_site_titles' => true]);
     $dom = $domain->renderInstance()->newDOMDocument();
     $domain->renderInstance()->loadTemplateFromFile($dom, 'news.html');
     $output_filter = new \Nelliel\OutputFilter();

diff --git a/board_files/templates/nelliel_basic/header.html b/board_files/templates/nelliel_basic/header.html
@@ -23,6 +23,8 @@
 		<span>[<a data-parse-id="news" href="" data-i18n="gettext">News</a>]</span>
 		<span>[<a data-parse-id="about-nelliel" href="" data-i18n="gettext">About Nelliel</a>]</span>
 	</nav>
+	<div id="top-site-name" class="site-name"></div>
+	<div id="top-site-slogan" class="site-slogan"></div>
 	<div class="site-banner"><img src="" id="top-site-banner"></div>
 	<h1 class="board-title" id="top-board-title"></h1>
 	<div class="board-banner"><img src="" id="top-board-banner"></div>

diff --git a/board_files/templates/nelliel_basic/management/site_settings_panel.html b/board_files/templates/nelliel_basic/management/site_settings_panel.html
@@ -48,22 +48,20 @@
 			<input class="display-cell" type="text" name="recaptcha_sekrit_key" id="recaptcha_sekrit_key" size="45" value="">
 		</div>
 		<div class="display-row">
-			<label class="display-cell" for="site_favicon" data-i18n="gettext">Site favicon</label>
-			<input class="display-cell" type="text" name="site_favicon" id="site_favicon" size="45" value="">
+			<label class="display-cell" for="site_name" data-i18n="gettext">Site name</label>
+			<input class="display-cell" type="text" name="site_name" id="site_name" size="30" value="">
 		</div>
 		<div class="display-row">
-			<input type="hidden" name="show_site_favicon" value="0">
-			<input type="checkbox" name="show_site_favicon" id="show_site_favicon" value="1">
-			<label for="show_site_favicon" data-i18n="gettext">Show site favicon</label>
+			<label class="display-cell" for="site_slogan" data-i18n="gettext">Site slogan</label>
+			<input class="display-cell" type="text" name="site_slogan" id="site_slogan" size="30" value="">
 		</div>
 		<div class="display-row">
-			<label class="display-cell" for="site_banner" data-i18n="gettext">Site banner</label>
-			<input class="display-cell" type="text" name="site_banner" id="site_banner" size="45" value="">
+			<label class="display-cell" for="site_favicon" data-i18n="gettext">Site favicon</label>
+			<input class="display-cell" type="text" name="site_favicon" id="site_favicon" size="45" value="">
 		</div>
 		<div class="display-row">
-			<input type="hidden" name="show_site_banner" value="0">
-			<input type="checkbox" name="show_site_banner" id="show_site_banner" value="1">
-			<label for="show_site_banner" data-i18n="gettext">Show site banner</label>
+			<label class="display-cell" for="site_banner" data-i18n="gettext">Site banner</label>
+			<input class="display-cell" type="text" name="site_banner" id="site_banner" size="45" value="">
 		</div>
 		<div class="display-row">
 			<input type="hidden" name="display_render_timer" value="0">