Просмотр исходного кода

Ticket #255 - Layout fixes and improvements.

AntonLV 10 лет назад
Родитель
Сommit
1f0e6e262a

+ 1 - 1
modules/base/text/classes/BxBaseModTextSearchResult.php

@@ -28,7 +28,7 @@ class BxBaseModTextSearchResult extends BxBaseModGeneralSearchResult
             $this->sUnitTemplate = $this->aUnitViews[bx_get($this->sUnitViewParamName)];
 
         if ('unit_gallery.html' == $this->sUnitTemplate)
-            $this->addContainerClass (array('bx-def-margin-sec-neg', 'bx-base-text-unit-gallery-wrapper'));
+            $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-text-unit-gallery-wrapper'));
     }
 
     protected function processReplaceableMarkers($oProfileAuthor) 

+ 1 - 1
modules/base/text/template/css/main.css

@@ -157,7 +157,7 @@
     margin-bottom:0;
 }
 
-.bx-base-text-entity-share .bx-vote,
+.bx-base-text-entity-share .bx-vote-wrapper,
 .bx-base-text-entity-share .bx-report,
 .bx-base-text-entity-share .bx-tl-share,
 .bx-base-text-entity-share .bx-social-sharing {

+ 1 - 1
modules/base/text/template/entry-share.html

@@ -1 +1 @@
-<div class="bx-base-text-entity-share bx-clearfix">__comments____vote____share____report____social__</div>
+<div class="bx-base-text-entity-share bx-clearfix">__comments__<div class="bx-vote-wrapper bx-def-margin-right-auto bx-def-margin-thd-topbottom">__vote__</div>__share____report____social__</div>

+ 1 - 0
modules/boonex/market/template/css/main.css

@@ -11,6 +11,7 @@ div.bx-market-unit-title {
 	text-align: center;
 }
 div.bx-market-unit-info {
+	overflow: visible;
 	white-space: nowrap;
 }
 div.bx-market-ui-cell {

+ 2 - 2
modules/boonex/market/template/unit_gallery.html

@@ -2,7 +2,7 @@
 	<div class="bx-market-unit-gallery-cnt bx-def-margin-sec bx-def-round-corners bx-def-box bx-def-color-bg-box">
 	    <bx_if:thumb>
 	        <a href="__content_url__" title="__summary_attr__">
-	            <div class="bx-base-text-unit-thumb bx-def-gal-div-size bx-def-box bx-def-color-bg-box bx-def-font-middle" style="background-image:url(__gallery_url__)">
+	            <div class="bx-base-text-unit-thumb bx-def-gal-div-size bx-def-font-middle" style="background-image:url(__gallery_url__)">
 	                <div class="bx-base-text-unit-strecher">__strecher__</div>
 	            </div>
 	        </a>
@@ -20,7 +20,7 @@
 				<a class="bx-def-margin-sec-topbottom bx-def-font-color" href="__content_url__">__title__</a>
 		    </div>
 
-		    <div class="bx-market-init-info bx-base-text-unit-info bx-def-margin-thd-top">
+		    <div class="bx-market-unit-info bx-base-text-unit-info bx-def-margin-thd-top">
 		    	<div class="bx-market-ui-cell bx-market-uic-left">__entry_votes__</div>
 		        <div class="bx-market-ui-cell bx-market-uic-right">
 		        	<!-- TODO: Buttons to checkout instead of text price. -->

+ 10 - 0
template/css/default.less

@@ -77,6 +77,16 @@
 .bx-def-margin-sec-neg {
     .margin(-@bx-margin-sec);
 }
+.bx-def-margin-sec-lefttopright {
+	.margin-left(@bx-margin-sec);
+    .margin-top(@bx-margin-sec);
+    .margin-right(@bx-margin-sec);
+}
+.bx-def-margin-sec-lefttopright-neg {
+	.margin-left(-@bx-margin-sec);
+    .margin-top(-@bx-margin-sec);
+    .margin-right(-@bx-margin-sec);
+}
 .bx-def-margin-sec-rightbottomleft {
     .margin-right(@bx-margin-sec);
     .margin-bottom(@bx-margin-sec);

+ 3 - 1
template/menu_buttons_hor.html

@@ -2,6 +2,8 @@
     <bx_repeat:menu_items><li class="bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn bx-def-margin-right" href="__link__" target="__target__" onclick="__onclick__">
         <bx_if:image><i style="background-image:url(__icon_url__)"></i></bx_if:image>
         <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
-        <u>__title__</u>
+        <bx_if:title>
+        	<u>__title__</u>
+        </bx_if:title>
     </a></li></bx_repeat:menu_items>
 </ul>

+ 6 - 0
template/scripts/BxBaseMenu.php

@@ -97,6 +97,12 @@ class BxBaseMenu extends BxDolMenu
         	return false;
 
 		$a['title'] = _t($a['title']);
+		$a['bx_if:title'] = array(
+			'condition' => !empty($a['title']),
+			'content' => array(
+				'title' => $a['title']
+			)
+		);
 
         $this->removeMarker('addon');
 

+ 1 - 1
template/scripts/BxBaseMenuSwitchLanguage.php

@@ -34,7 +34,7 @@ class BxBaseMenuSwitchLanguage extends BxTemplMenu
 
         $aBaseLink = parse_url(BX_DOL_URL_ROOT);
         $sBaseLink = (!empty($aBaseLink['scheme']) ? $aBaseLink['scheme'] : 'http') . '://' . $aBaseLink['host'];
-        $sPageLink = $oPermalink->unpermalink($sBaseLink . $_SERVER['REQUEST_URI']);
+        $sPageLink = $oPermalink->unpermalink($sBaseLink . $_SERVER['REQUEST_URI'], false);
 
         $sPageParams = '';
         if(strpos($sPageLink, '?') !== false)