0.6.2 rev 4104

nightflyza · Jan 15, 2015 · 73f8479 · 73f8479
1 parent 5210858
commit 73f8479
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 14 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-0.6.2 rev 4100
+0.6.2 rev 4104
diff --git a/api/libs/api.workaround.php b/api/libs/api.workaround.php
@@ -272,7 +272,7 @@ function web_EditorStringDataFormMAC($fieldnames, $fieldkey, $useraddress, $oldd
     if ($altconf['MACVEN_ENABLED']) {
         $vendorframe = wf_tag('iframe', false, '', 'src="?module=macvendor&mac=' . $olddata . '" width="360" height="160" frameborder="0"');
         $vendorframe.= wf_tag('iframe', true);
-        $lookuplink = wf_modal(wf_img('skins/macven.gif', __('Device vendor')), __('Device vendor'), $vendorframe, '', '400', '220');
+        $lookuplink = wf_modalAuto(wf_img('skins/macven.gif', __('Device vendor')), __('Device vendor'), $vendorframe, '');
     } else {
         $lookuplink = '';
     }
@@ -375,7 +375,7 @@ function web_EditorStringDataFormMACSelect($fieldnames, $fieldkey, $useraddress,
     if ($alterconf['MACVEN_ENABLED']) {
         $vendorframe = wf_tag('iframe', false, '', 'src="?module=macvendor&mac=' . $olddata . '" width="360" height="160" frameborder="0"');
         $vendorframe.= wf_tag('iframe', true);
-        $lookuplink = wf_modal(wf_img('skins/macven.gif', __('Device vendor')), __('Device vendor'), $vendorframe, '', '400', '220');
+        $lookuplink = wf_modalAuto(wf_img('skins/macven.gif', __('Device vendor')), __('Device vendor'), $vendorframe,'');
     } else {
         $lookuplink = '';
     }

diff --git a/config/globalmenu.ini b/config/globalmenu.ini
@@ -200,7 +200,7 @@ NEED_OPTION=PAYMENTCARDS_ENABLED
 [cftypes]
 NAME="Profile fields"
 URL="?module=cftypes"
-ICON=""
+ICON="cftypes.png"
 CATEGORY=2
 NEED_RIGHT=CFTYPES
 NEED_OPTION=
@@ -247,7 +247,7 @@ NEED_RIGHT=MASSSEND
 NEED_OPTION=MASSSEND_ENABLED
 
 [mtsigmon]
-NAME="Mikrotik signal monitor"
+NAME="Mikrotik AP signals"
 URL="?module=mtsigmon"
 ICON="mtsigmon.png"
 CATEGORY=2

diff --git a/languages/russian/billing.php b/languages/russian/billing.php
@@ -1835,6 +1835,7 @@
 $lang['def']['Personalize menu']='Пресонализировать меню';
 $lang['def']['Selfcredits']='Самокредитование';
 $lang['def']['Fast access']='Быстрый доступ';
+$lang['def']['Mikrotik AP signals']='Сигнал БС Mikrotik';
 $lang['def']['']='';
 
 

diff --git a/languages/ukrainian/billing.php b/languages/ukrainian/billing.php
@@ -1849,5 +1849,6 @@
 $lang['def']['Personalize menu']='Пресоналізувати меню';
 $lang['def']['Selfcredits']='Самокредитування';
 $lang['def']['Fast access']='Швидкий доступ';
+$lang['def']['Mikrotik AP signals']='Сигнал БС Mikrotik';
 
 ?>
diff --git a/skins/menuicons/cftypes.png b/skins/menuicons/cftypes.png
diff --git a/skins/ubng/css/layout.css b/skins/ubng/css/layout.css
@@ -46,13 +46,6 @@ header .toggleLinkWMAN {
 }
 
 
-/* responsive release info */
-@media only screen and (max-width: 1000px) {
-    .ubverinfo {
-        display: none;
-    }
-}
-
 
 header#header h1.site_title, header#header h2.section_title {
 float: left;
@@ -183,6 +176,7 @@ border-radius: 5px;
 box-shadow: 0 1px 0 #fff;
 height: 23px;
 margin: 4px 3%;
+overflow: hidden;
 }
 
 .breadcrumbs a {

diff --git a/skins/ubng/css/ubilling.css b/skins/ubng/css/ubilling.css
@@ -536,4 +536,22 @@ margin-top: -130px;
     float: left;
     padding-left: 10px;
     padding-right: 5px;
+}
+
+
+/* responsive release info */
+@media only screen and (max-width: 1000px) {
+    .ubverinfo {
+        display: none;
+    }
+
+    .ubproductname {
+        font-size: 12pt;
+    }
+}
+
+@media only screen and (max-width: 800px) {
+    .ubproductname {
+       display: none;
+    }
 }
diff --git a/skins/ubng/skin.general.php b/skins/ubng/skin.general.php
@@ -25,7 +25,7 @@
                     <a href="http://ubilling.net.ua">
                     <img src="<?=CUR_SKIN_PATH?>/images/logo.png" height="32" border="0">
                     </a> 
-                    Ubilling
+                    <span class="ubproductname">Ubilling</span>
                     <sup class="ubverinfo"><?=file_get_contents('RELEASE')?></sup>
                     </h1>
 

diff --git a/userstats/config/userstats.ini b/userstats/config/userstats.ini
@@ -120,7 +120,7 @@ SP_URL=http://www.vataga.com.ua/speedtest_mini/
 ;Downloads module enabled?
 ZL_ENABLED=1
 ;Downloads options in format icon_path|url|title - delimiter comma
-ZL_OPTIONS="iconz/key.gif|http://stargazer.net.ua/download/inetaccess/2.62.8/inetaccess.2.62.8.win.exe|Авторизатор для Windows"
+ZL_OPTIONS="iconz/chrome.png|http://tinyurl.com/px3poz7|Расширение для Chrome"
 
 ;account freezing enabled?
 AF_ENABLED=1

diff --git a/userstats/iconz/chrome.png b/userstats/iconz/chrome.png
diff --git a/userstats/iconz/firefox.png b/userstats/iconz/firefox.png