Merge branch 'master' of https://github.com/boonex/dolphin

modules/boonex/chat_plus/classes/BxChatPlusModule.php

@@ -70,19 +70,18 @@ class BxChatPlusModule extends BxDolModule
         $sChatUrl = $aUrl['scheme'] . '://' . $aUrl['host'] . ($aUrl['port'] ? ':' . $aUrl['port'] : '');
 
         return <<<EOS
+
 <!-- Start of Helpdesk Livechat Script -->
 <script type="text/javascript">
-(function(w, d, s, f, u) {
-	w[f] = w[f] || [];
-	w[f].push(u);
-	var h = d.getElementsByTagName(s)[0],
-		j = d.createElement(s);
-	j.async = true;
-	j.src = '{$sChatUrl}/packages/rocketchat_livechat/assets/rocket-livechat.js';
+(function(w, d, s, u) {
+	w.RocketChat = function(c) { w.RocketChat._.push(c) }; w.RocketChat._ = []; w.RocketChat.url = u;
+	var h = d.getElementsByTagName(s)[0], j = d.createElement(s);
+	j.async = true; j.src = '{$sChatUrl}/packages/rocketchat_livechat/assets/rocket-livechat.js';
 	h.parentNode.insertBefore(j, h);
-})(window, document, 'script', 'initRocket', '{$sChatUrl}/livechat');
+})(window, document, 'script', '{$sChatUrl}/livechat');
 </script>
 <!-- End of Helpdesk Livechat Script -->
+
 EOS;
 
     }

modules/boonex/chat_plus/install/langs/en.xml

@@ -27,7 +27,7 @@ Enter the chat URL in the form below. <br />
 
 Then OAuth login must be configured. <a href="{0}modules/?r=oauth2/administration/">Generate Key & Secret pair</a> in OAuth2 Server module by pointing chat URL and  desired name. <br />
 
-After Key & Secret pair is generated you need to enter them in Chat Administration &gt; Accounts &gt; Dolphin.
+After Key & Secret pair is generated you need to enter them in Chat Administration &gt; OAuth &gt; Dolphin.
 
 <hr />
 

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

@@ -28,7 +28,7 @@
 Затем OAuth модуль должен быть сконфигурирован. <a href="{0}modules/?r=oauth2/administration/">Сгенерируйте пару Ключ & Секрет</a> в модуле OAuth2 сервер указав адрес чата и произвольный заголовок. <br />
 
 После того как пара Ключ & Секрет сгенерированы, нужно указать их в чате: <br />
-Администрирование &gt; Аккаунты &gt; Dolphin.
+Администрирование &gt; OAuth &gt; Dolphin.
 
 <hr />
 

template/css/forms.css

@@ -347,10 +347,6 @@
 
 /* view mode */
 
-.bx-form-view-section legend {
-    padding-left:0;
-}
-
 .bx-form-row-view-wrapper > div {
     display: inline-block;
     white-space: normal;

template/css/general.css

@@ -65,13 +65,19 @@
     height: 3rem;
            
     margin:0 48px;
-    margin:0 3rem;
-
-    line-height: 48px;
-    line-height: 3rem;
+    margin:0 6rem;
     
     vertical-align: middle;
     text-align: center;
+}
+
+#bx-logo-container a span {
+    display:inline-block;
+
+    max-width:100%;
+
+    line-height: 48px;
+    line-height: 3rem;
 
     overflow:hidden;
     text-overflow:ellipsis;

template/css/media-phone.css

@@ -40,6 +40,12 @@ html {
     width:auto;
 }
 
+/* general.css */
+
+#bx-logo-container {
+    margin:0 3rem;
+}
+
 /* common.css */
 
 /* make popup fullscreen */

template/scripts/BxBaseFormView.php

@@ -503,7 +503,7 @@ BLAH;
 
 
         if (isset($this->aParams['view_mode']) && $this->aParams['view_mode'])
-            $sLegend = '<legend class="bx-def-padding-sec-right bx-def-font-grayed bx-def-font-h3">' . bx_process_output($aInput['caption']) . '</legend>';
+            $sLegend = '<legend class="bx-def-padding-left bx-def-padding-sec-right bx-def-font-grayed bx-def-font-h3">' . bx_process_output($aInput['caption']) . '</legend>';
         else
             $sLegend = '<legend class="bx-def-padding-left bx-def-padding-sec-right bx-def-font-grayed bx-def-font-h3"><a href="javascript:void(0);">' . bx_process_output($aInput['caption']) . '</a></legend>';
 

template/scripts/BxBaseFunctions.php

@@ -316,7 +316,7 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
         if(empty($sAlt))
         	$sAlt = getParam('site_title');
 
-        $sLogo = $sAlt;
+        $sLogo = '<span>' . $sAlt . '</span>';
 
         $sFileUrl = $this->getMainLogoUrl();
         if (!empty($sFileUrl)) {