AntonLV 5 years ago
parent
commit
19d878803c

+ 1 - 1
studio/template/css/launcher.css

@@ -250,7 +250,7 @@ div.bx-std-widget-caption {
 
     font-stretch: condensed;
     font-weight: 500;
-    font-size: 0.75rem;
+    font-size: 0.875rem;
 }
 div.bx-std-widget-caption-jitter {
     position: absolute;

+ 2 - 2
studio/template/images/icons/wi-launcher.svg

@@ -2,8 +2,8 @@
 <mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="33" height="32">
 <path d="M16.5 32C23.5111 32 27.4087 32 29.9543 29.4543C32.5 26.9087 32.5 23.0111 32.5 16C32.5 8.98889 32.5 5.09132 29.9543 2.54566C27.4087 0 23.5111 0 16.5 0C9.48889 0 5.59132 0 3.04566 2.54566C0.5 5.09132 0.5 8.98889 0.5 16C0.5 23.0111 0.5 26.9087 3.04566 29.4543C5.59132 32 9.48889 32 16.5 32Z" fill="white"/>
 </mask>
-<g mask="url(#mask0)">
-<path d="M29.6008 29.1008C28.4309 30.2707 26.9369 30.8779 24.8291 31.1871C22.7046 31.4988 20.0198 31.5 16.5 31.5C12.9802 31.5 10.2954 31.4988 8.17086 31.1871C6.06315 30.8779 4.56907 30.2707 3.39921 29.1008C2.22935 27.9309 1.62213 26.4369 1.31291 24.3291C1.00122 22.2046 1 19.5198 1 16C1 12.4802 1.00122 9.79544 1.31291 7.67086C1.62213 5.56315 2.22935 4.06907 3.39921 2.89921C4.56907 1.72935 6.06315 1.12213 8.17086 0.812912C10.2954 0.50122 12.9802 0.5 16.5 0.5C20.0198 0.5 22.7046 0.50122 24.8291 0.812912C26.9369 1.12213 28.4309 1.72935 29.6008 2.89921C30.7707 4.06907 31.3779 5.56315 31.6871 7.67086C31.9988 9.79544 32 12.4802 32 16C32 19.5198 31.9988 22.2046 31.6871 24.3291C31.3779 26.4369 30.7707 27.9309 29.6008 29.1008Z" stroke="#E8E8E8"/>
+<g mask="url(#mask0)" opacity="0.7">
+<path d="M29.6008 29.1008C28.4309 30.2707 26.9369 30.8779 24.8291 31.1871C22.7046 31.4988 20.0198 31.5 16.5 31.5C12.9802 31.5 10.2954 31.4988 8.17086 31.1871C6.06315 30.8779 4.56907 30.2707 3.39921 29.1008C2.22935 27.9309 1.62213 26.4369 1.31291 24.3291C1.00122 22.2046 1 19.5198 1 16C1 12.4802 1.00122 9.79544 1.31291 7.67086C1.62213 5.56315 2.22935 4.06907 3.39921 2.89921C4.56907 1.72935 6.06315 1.12213 8.17086 0.812912C10.2954 0.50122 12.9802 0.5 16.5 0.5C20.0198 0.5 22.7046 0.50122 24.8291 0.812912C26.9369 1.12213 28.4309 1.72935 29.6008 2.89921C30.7707 4.06907 31.3779 5.56315 31.6871 7.67086C31.9988 9.79544 32 12.4802 32 16C32 19.5198 31.9988 22.2046 31.6871 24.3291C31.3779 26.4369 30.7707 27.9309 29.6008 29.1008Z" stroke="white" stroke-width="2.0" />
 <path fill-rule="evenodd" clip-rule="evenodd" d="M12.25 13.75H9.5C8.395 13.75 7.5 12.855 7.5 11.75V9C7.5 7.895 8.395 7 9.5 7H12.25C13.355 7 14.25 7.895 14.25 9V11.75C14.25 12.855 13.355 13.75 12.25 13.75Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M23.5 13.75H20.75C19.645 13.75 18.75 12.855 18.75 11.75V9C18.75 7.895 19.645 7 20.75 7H23.5C24.605 7 25.5 7.895 25.5 9V11.75C25.5 12.855 24.605 13.75 23.5 13.75Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M12.25 25H9.5C8.395 25 7.5 24.105 7.5 23V20.25C7.5 19.145 8.395 18.25 9.5 18.25H12.25C13.355 18.25 14.25 19.145 14.25 20.25V23C14.25 24.105 13.355 25 12.25 25Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>

+ 4 - 1
studio/template/scripts/BxBaseStudioFunctions.php

@@ -131,6 +131,8 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
         $aModule = BxDolModuleQuery::getInstance()->getModuleByName($mixedWidget['module']);
         $bEnabled = empty($aModule) || !is_array($aModule) || (int)$aModule['enabled'] == 1;
 
+        $sCaption = _t($mixedWidget['caption']);
+        
         return $oTemplate->parseHtmlByName('widget.html', array(
             'id' => $mixedWidget['id'],
             'url' => !empty($mixedWidget['url']) ? bx_replace_markers($mixedWidget['url'], $aMarkers) : 'javascript:void(0)',
@@ -166,7 +168,8 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
                 'condition' => !$bIcon,
                 'content' => array('icon_url' => $sIcon),
             ),
-            'caption' => _t($mixedWidget['caption']),
+            'caption' => $sCaption,
+            'caption_attr' => bx_html_attribute($sCaption),
             'widget_disabled_class' => !$bEnabled ? 'bx-std-widget-icon-disabled' : '',
             'widget_featured_class' => (int)$mixedWidget['featured'] == 1 ? 'bx-std-widget-icon-featured' : '',
             'widget_styles' => $bFeatured && (int)$mixedWidget['featured'] != 1 ? 'display:none;' : ''

+ 1 - 1
studio/template/widget.html

@@ -37,7 +37,7 @@
         <div class="bx-std-widget-loading"></div>
 
         <div class="bx-std-widget-caption">
-            <a class="bx-std-widget-link" href="__url__" <bx_if:show_click_link>onClick="__content__"</bx_if:show_click_link>>__caption__</a>
+            <a class="bx-std-widget-link" href="__url__" <bx_if:show_click_link>onClick="__content__"</bx_if:show_click_link> title="__caption_attr__">__caption__</a>
             <div class="bx-std-widget-caption-jitter" style="display:none"></div>
         </div>
     </div>