Ticket #2105 - Singe line footer. Language switcher in popup.

inc/classes/BxDolPermalinks.php

@@ -220,7 +220,7 @@ class BxDolPermalinks extends BxDolDb implements iBxDolSingleton
 
             $sPage = substr($sLink, $iLength);
 
-            return $sPrefix . $this->aLinksPermalink[$sKey]['standard'] . $sPage;
+            return $sPrefix . $this->aLinksPermalink[$sKey]['standard'] . str_replace('?', '&', $sPage);
 
         }
 

install/sql/system.sql

@@ -3586,8 +3586,9 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_footer', 'system', 'about', '_sys_menu_item_title_system_about', '_sys_menu_item_title_about', 'page.php?i=about', '', '', '', '', 2147483647, 1, 1, 1),
 ('sys_footer', 'system', 'terms', '_sys_menu_item_title_system_terms', '_sys_menu_item_title_terms', 'page.php?i=terms', '', '', '', '', 2147483647, 1, 1, 2),
 ('sys_footer', 'system', 'privacy', '_sys_menu_item_title_system_privacy', '_sys_menu_item_title_privacy', 'page.php?i=privacy', '', '', '', '', 2147483647, 1, 1, 3),
-('sys_footer', 'system', 'switch_language', '_sys_menu_item_title_system_switch_language', '_sys_menu_item_title_switch_language', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_language_popup'', window);', '', '', '', 2147483647, 0, 1, 4),
+('sys_footer', 'system', 'switch_language', '_sys_menu_item_title_system_switch_language', '_sys_menu_item_title_switch_language', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_language_popup'', window);', '', '', '', 2147483647, 1, 1, 4),
 ('sys_footer', 'system', 'switch_template', '_sys_menu_item_title_system_switch_template', '_sys_menu_item_title_switch_template', 'javascript:void(0);', 'bx_menu_popup(''sys_switch_template'', window);', '', '', '', 2147483647, 1, 1, 5),
+('sys_footer', 'system', 'copyright', '_sys_menu_item_title_system_copyright', '_sys_menu_item_title_copyright', 'javascript:void(0)', 'on_copyright_click()', '', '', '', 2147483647, 1, 1, 6),
 ('sys_footer', 'system', 'powered_by', '_sys_menu_item_title_system_powered_by', '', 'https://una.io', '', '_blank', 'una.png', '', 2147483647, 1, 1, 9999);
 
 -- site toolbar menu

modules/boonex/decorous/data/template/system/_sub_footer.html

@@ -16,26 +16,19 @@
 					</div> <!-- #bx-content-wrapper -->
 	
 	                <div id="bx-footer-wrapper" class="bx-footer-wrapper bx-def-image-bg-footer bx-def-color-bg-footer bx-def-border-footer bx-shadow-footer">    
-				        <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
-				            <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
-				                <div class="bx-footer-cnt bx-content-padding-footer">
-				                    <bx_injection:injection_footer_before />
-				        
-				                    <div id="bx-menu-bottom">
-				                        <bx_menu:sys_footer />
-				                    </div>
-				                    <div id="bx-footer-copyright">
-				                        <a href="javascript:void(0)" onclick="javascript:on_copyright_click()" title="__copyright_attr__" ><i class="sys-icon copyright"></i></a>
-				                    </div>
-				                    <div class="bx-clear"></div>
-				                    <div class="bx-menu-switch-language-inline bx-def-margin-sec-top">
-				                        <bx_menu:sys_switch_language_inline />
-				                    </div>
-				        
-				                    <bx_injection:injection_footer_after />
-				                </div>
-				            </div>
-				        </div>
+                            <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
+                                <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
+                                    <div class="bx-footer-cnt bx-content-padding-footer">
+                                        <bx_injection:injection_footer_before />
+
+                                        <div id="bx-menu-bottom">
+                                            <bx_menu:sys_footer />
+                                        </div>
+
+                                        <bx_injection:injection_footer_after />
+                                    </div>
+                                </div>
+                            </div>
 	                </div>
 	
 		        </div> <!-- .content-wrapper -->

modules/boonex/english/data/langs/system/en.xml

@@ -2182,6 +2182,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Geolocation is not supported by this browser]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Location off]]></string>
 	<string name="_sys_menu_item_title_about"><![CDATA[About]]></string>
+        <string name="_sys_menu_item_title_copyright"><![CDATA[Copyright]]></string>
 	<string name="_sys_menu_item_title_privacy"><![CDATA[Privacy]]></string>
 	<string name="_sys_menu_item_title_search"><![CDATA[Search]]></string>
 	<string name="_sys_menu_item_title_switch_language"><![CDATA[Language]]></string>
@@ -2247,6 +2248,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_menu_item_title_sm_country"><![CDATA[Country]]></string>
     <string name="_sys_menu_item_title_sm_country_city"><![CDATA[Country and City]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[About]]></string>
+        <string name="_sys_menu_item_title_system_copyright"><![CDATA[Copyright]]></string>
 	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Privacy]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Language]]></string>
 	<string name="_sys_menu_item_title_system_switch_template"><![CDATA[Template]]></string>

modules/boonex/lucid/data/template/system/_sub_footer.html

@@ -16,32 +16,17 @@
 					</div> <!-- #bx-content-wrapper -->
 	
 	                <div id="bx-footer-wrapper" class="bx-footer-wrapper bx-def-image-bg-footer bx-def-color-bg-footer bx-def-border-footer bx-shadow-footer">    
-				        <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
-				            <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
-				                <div class="bx-footer-cnt bx-content-padding-footer">
-				                    <bx_injection:injection_footer_before />
-				                    <div id="bx-menu-bottom" class="bx-footer-line bx-fl1 bx-def-margin-sec-top-auto">
-				                        <bx_menu:sys_footer />
-				                    </div>
-				                    <!--
-				                    <div class="bx-footer-line bx-fl2 bx-def-margin-sec-top-auto">
-				                        <div class="bx-footer-cell bx-fc1"></div>
-				                        <div class="bx-footer-cell bx-fc2"></div>
-				                        <div class="bx-footer-cell bx-fc3"></div>
+                            <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
+                                <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
+                                    <div class="bx-footer-cnt bx-content-padding-footer">
+                                        <bx_injection:injection_footer_before />
+                                        <div id="bx-menu-bottom" class="bx-def-margin-sec-top-auto">
+                                            <bx_menu:sys_footer />
+                                        </div>
+                                        <bx_injection:injection_footer_after />
                                     </div>
-                                    -->
-                                    <div class="bx-footer-line bx-fl3 bx-def-margin-sec-top-auto">
-                                        <div class="bx-footer-cell bx-fc1"></div>
-                                        <div class="bx-footer-cell bx-fc2">__copyright__</div>
-                                    </div>
-				                    <div class="bx-footer-line bx-fl4 bx-menu-switch-language-inline bx-def-margin-sec-top-auto">
-				                        <bx_menu:sys_switch_language_inline />
-				                    </div>
-				        
-				                    <bx_injection:injection_footer_after />
-				                </div>
-				            </div>
-				        </div>
+                                </div>
+                            </div>
 	                </div>
 	
 		        </div> <!-- .content-wrapper -->

modules/boonex/lucid/data/template/system/css/general.css

@@ -276,63 +276,11 @@
 
 /*--- Footer ---*/
 #bx-footer-wrapper {
-	height: auto;
-}
-.bx-footer-line {
-    position: relative;
-}
-.bx-footer-line.bx-fl1#bx-menu-bottom {
-    float: none;
-}
-.bx-footer-line.bx-fl1 .bx-menu-hor,
-.bx-footer-line.bx-fl2,
-.bx-footer-line.bx-fl3 {
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: flex-start;
-    align-items: flex-start;
-    -webkit-justify-content: flex-start;
-    justify-content: flex-start;
-	-webkit-flex-wrap: wrap;
-    flex-wrap: wrap;
-}
-.bx-footer-line.bx-fl1 .bx-menu-hor.bx-clearfix::before, 
-.bx-footer-line.bx-fl1 .bx-menu-hor.bx-clearfix::after {
-    content: unset;
-}
-.bx-footer-line.bx-fl1 .bx-menu-hor li {
-    display: block;
-    margin: 0px;
-    padding: 0px 1rem;
-	line-height: 2rem;
-}
-.bx-footer-line.bx-fl1 .bx-menu-hor li.bx-menu-tab-active a {
-    color: #fff;    
-}
-
-.bx-footer-line.bx-fl2 {
-    padding: 0px;
-}
-.bx-footer-line.bx-fl2 .bx-footer-cell {
-    position: relative;
-}
-
-.bx-footer-line.bx-fl3 {
-    position: relative;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: flex-start;
-    align-items: flex-start;
-    -webkit-justify-content: space-between;
-    justify-content: space-between;
-
-    line-height: 2rem;
+    height: auto;
 }
 
 
 /* Author block in content modules */
-
 .sys-author .bx-def-unit-info.bx-def-thumb-size-max-height {
     max-height:none;
 }
-

modules/boonex/ocean/data/template/system/_sub_footer.html

@@ -16,31 +16,20 @@
 	</div> <!-- #bx-content-wrapper -->
 	
 	<div id="bx-footer-wrapper">
-		<div class="bx-def-centered bx-def-padding-topbottom bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-		
-		    <div id="bx-footer" class="bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
-		        <bx_injection:injection_footer_before />
-		
-		        <div id="bx-menu-bottom">
-		            <bx_menu:sys_footer />
-		        </div>
-		        <div id="bx-footer-copyright">
-		        	<a href="javascript:void(0)" onclick="javascript:on_copyright_click()" title="__copyright_attr__" ><i class="sys-icon copyright"></i></a>
-		        </div>
-		        <div class="bx-clear"></div>
-		        <div class="bx-menu-switch-language-inline bx-def-margin-sec-top">
-		        	<bx_menu:sys_switch_language_inline />
-		        </div>
-		
-		        <bx_injection:injection_footer_after />
-		    </div>
-		
-		</div>
-	
+            <div class="bx-def-centered bx-def-padding-topbottom bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
+                <div id="bx-footer" class="bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
+                    <bx_injection:injection_footer_before />
+
+                    <div id="bx-menu-bottom">
+                        <bx_menu:sys_footer />
+                    </div>
+
+                    <bx_injection:injection_footer_after />
+                </div>
+            </div>
 	</div>
-	
-	<bx_menu:sys_site_action />
 
+	<bx_menu:sys_site_action />
 </div>
 
 <bx_include_auto:_footer.html />

modules/boonex/ocean/data/template/system/css/general.css

@@ -29,21 +29,6 @@
 
 /* --------------- footer */
 #bx-footer-wrapper {
-	width: 100%;
-	height: 100px;
-	height: 6.5625rem;
-	bottom: 0;
-
-	background-color: #ffffff;
-	border-top: 1px solid #93b3c3;
-}
-
-/* --------------- menu bottom */
-#bx-menu-bottom,
-#bx-footer-copyright {
-	line-height: 24px;
-	line-height: 1.5rem;
-}
-#bx-menu-bottom {
-	float: left;
+    background-color: #ffffff;
+    border-top: 1px solid #93b3c3;
 }

modules/boonex/protean/data/template/system/_sub_footer.html

@@ -16,26 +16,19 @@
 	</div> <!-- #bx-content-wrapper -->
 
 	<div id="bx-footer-wrapper" class="bx-def-image-bg-footer bx-def-color-bg-footer bx-def-border-footer bx-shadow-footer">	
-		<div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-		    <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
-		    	<div class="bx-footer-cnt bx-content-padding-footer">
-			        <bx_injection:injection_footer_before />
-		
-			        <div id="bx-menu-bottom">
-			            <bx_menu:sys_footer />
-			        </div>
-			        <div id="bx-footer-copyright">
-			        	<a href="javascript:void(0)" onclick="javascript:on_copyright_click()" title="__copyright_attr__" ><i class="sys-icon copyright"></i></a>
-			        </div>
-			        <div class="bx-clear"></div>
-			        <div class="bx-menu-switch-language-inline bx-def-margin-sec-top">
-			        	<bx_menu:sys_switch_language_inline />
-			        </div>
-		
-			        <bx_injection:injection_footer_after />
-				</div>
-		    </div>
-		</div>
+            <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
+                <div id="bx-footer" class="bx-footer bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
+                    <div class="bx-footer-cnt bx-content-padding-footer">
+                        <bx_injection:injection_footer_before />
+
+                        <div id="bx-menu-bottom">
+                            <bx_menu:sys_footer />
+                        </div>
+
+                        <bx_injection:injection_footer_after />
+                    </div>
+                </div>
+            </div>
 	</div>
 
 	<bx_menu:sys_site_action />

modules/boonex/russian/data/langs/system/ru.xml

@@ -2183,6 +2183,7 @@
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Геолокация не поддерживается этим браузером]]></string>
 	<string name="_sys_location_undefined"><![CDATA[Отключить местоположение]]></string>
 	<string name="_sys_menu_item_title_about"><![CDATA[О нас]]></string>
+        <string name="_sys_menu_item_title_copyright"><![CDATA[Копирайт]]></string>
 	<string name="_sys_menu_item_title_privacy"><![CDATA[Конфиденциальность]]></string>
 	<string name="_sys_menu_item_title_search"><![CDATA[Поиск]]></string>
 	<string name="_sys_menu_item_title_switch_language"><![CDATA[Язык]]></string>
@@ -2247,6 +2248,7 @@
     <string name="_sys_menu_item_title_sm_country"><![CDATA[Страна]]></string>
     <string name="_sys_menu_item_title_sm_country_city"><![CDATA[Страна и город]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[Об...]]></string>
+        <string name="_sys_menu_item_title_system_copyright"><![CDATA[Копирайт]]></string>
 	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Конфиденциальность]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Язык]]></string>
 	<string name="_sys_menu_item_title_system_switch_template"><![CDATA[Тема]]></string>

template/_sub_footer.html

@@ -18,26 +18,19 @@
 	<div id="bx-footer-wrapper">
 
 		<hr class="bx-def-hr" />
-	
+
 		<div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-	
+
 		    <div id="bx-footer" class="bx-def-padding-sec-left bx-def-padding-sec-right bx-clearfix">
 		        <bx_injection:injection_footer_before />
-	
+
 		        <div id="bx-menu-bottom">
 		            <bx_menu:sys_footer />
 		        </div>
-		        <div id="bx-footer-copyright">
-		        	<a href="javascript:void(0)" onclick="javascript:on_copyright_click()" title="__copyright_attr__" ><i class="sys-icon copyright"></i></a>
-		        </div>
-		        <div class="bx-clear"></div>
-		        <div class="bx-menu-switch-language-inline bx-def-margin-sec-top">
-		        	<bx_menu:sys_switch_language_inline />
-		        </div>
-	
+
 		        <bx_injection:injection_footer_after />
 		    </div>
-	
+
 		</div>
 
 	</div>

template/css/general.css

@@ -162,16 +162,16 @@
 #bx-footer-wrapper {
     position: relative;
 
-	width: 100%;
-	height: 100px;
-	height: 6.25rem;
-	bottom: 0;
+    width: 100%;
+    height: 100px;
+    height: 4.0rem;
+    bottom: 0;
 }
 #bx-footer-wrapper .bx-def-hr {
 	margin-top: 0px;
 }
-#bx-menu-bottom {
-	float: left;
+#bx-menu-bottom ul {
+    text-align: center;
 }
 .bx-menu-switch-language-inline {
 	float: none;
@@ -184,9 +184,6 @@
 	float: none;
 	display: inline-block;
 }
-#bx-footer-copyright {
-    float:right;
-}
 
 /* --------------- 'Add to Homescreen' popup */
 .ath-container {

template/scripts/BxBaseMenuFooter.php

@@ -17,6 +17,10 @@ class BxBaseMenuFooter extends BxTemplMenu
         parent::__construct ($aObject, $oTemplate);
     }
 
+    public function getCode ()
+    {
+        return parent::getCode() . getVersionComment();
+    }
     public function getMenuItems ()
     {
         $aItems = parent::getMenuItems();
@@ -31,9 +35,9 @@ class BxBaseMenuFooter extends BxTemplMenu
                     break;
 
                 case 'switch_template':
-                	$aTemplates = get_templates_array(true, true);
+                    $aTemplates = get_templates_array(true, true);
 
-                	$sTemplateName = $this->_oTemplate->getCode();                    
+                    $sTemplateName = $this->_oTemplate->getCode();                    
                     $sTemplateTitle = isset($aTemplates[$sTemplateName]) ? $aTemplates[$sTemplateName] : '';
 
                     $sTitle = _t('_sys_menu_item_title_switch_template_mask', $aItems[$iKey]['title'], $sTemplateTitle);
@@ -43,6 +47,10 @@ class BxBaseMenuFooter extends BxTemplMenu
                     $aItems[$iKey]['bx_if:title']['content']['title'] = $sTitle;
                     break;
 
+                case 'copyright':
+                    $aItems[$iKey]['title_attr'] = bx_html_attribute(_t('_copyright', date('Y')));
+                    break;
+
                 case 'powered_by':
                     $sTitleAttr = bx_html_attribute(_t('_sys_txt_powered_by'));
 

template/scripts/BxBaseMenuSwitchLanguage.php

@@ -40,7 +40,7 @@ class BxBaseMenuSwitchLanguage extends BxTemplMenu
         list($sPageLink, $aPageParams) = $this->{'getBaseUrl' . bx_gen_method_name($this->_sType)}();
 
         $oPermalink = BxDolPermalinks::getInstance();
-		$sMethod = 'getItemTitle' . bx_gen_method_name($this->_sType);
+        $sMethod = 'getItemTitle' . bx_gen_method_name($this->_sType);
 
         $aItems = array();
         foreach( $aLanguages as $sName => $sLang ) {