Explorar el Código

#3734 Install script design is broken

Alex Trofimov hace 4 años
padre
commit
2765ded881

+ 3 - 3
install/classes/BxDolInstallController.php

@@ -76,7 +76,7 @@ class BxDolInstallController
 
         $this->_oView->out('permissions.php', compact('sPermissionsStyles', 'sPermissionsTable', 'bPermissionsOk'));
 
-        $this->_oView->setToolbarItem('question', 'http://www.boonex.com/trac/dolphin/wiki/DetailedInstall#InstallScript-Step1-Permissions', _t('_sys_inst_help_permissions'), '_blank');
+        $this->_oView->setToolbarItem('question', 'https://github.com/unaio/una/wiki/Installation', _t('_sys_inst_help_permissions'), '_blank');
 
         $this->_oView->pageEnd($this->_getTitle());
     }
@@ -90,7 +90,7 @@ class BxDolInstallController
 
         $this->_oView->out('site_config.php', compact('sForm'));
 
-        $this->_oView->setToolbarItem('question', 'http://www.boonex.com/trac/dolphin/wiki/DetailedInstall#Part2:CreateaDatabaseandaUser', _t('_sys_inst_help_site_config'), '_blank');
+        $this->_oView->setToolbarItem('question', 'https://github.com/unaio/una/wiki/Installation', _t('_sys_inst_help_site_config'), '_blank');
 
         $this->_oView->pageEnd($this->_getTitle());
     }
@@ -116,7 +116,7 @@ class BxDolInstallController
 
         $this->_oView->out('finish.php', compact('sPathToPhp'));
 
-        $this->_oView->setToolbarItem('question', 'http://www.boonex.com/trac/dolphin/wiki/DetailedInstall#InstallScript-Step5-CronJobs', _t('_sys_inst_help_finish'), '_blank');
+        $this->_oView->setToolbarItem('question', 'https://github.com/unaio/una/wiki/Installation', _t('_sys_inst_help_finish'), '_blank');
 
         $this->_oView->pageEnd($this->_getTitle());
 

+ 2 - 1
install/classes/BxDolInstallView.php

@@ -19,6 +19,7 @@ class BxDolInstallView
     protected $_aToolbarItem = array();
 
     protected $_aFilesCss = array (
+        '../../plugins_public/tailwind/css/tailwind.min.css',
         'common.css',
         'default.less',
         'general.css',
@@ -79,7 +80,7 @@ class BxDolInstallView
         $s = '';
         foreach ($this->_aFilesCss as $sFile)
             if (substr($sFile, -4) === '.css')
-                $s .= '<link rel="stylesheet" href="' . $this->_sUrlCss . $sFile . '" />';
+                $s .= '<link rel="stylesheet" href="' . $this->_sUrlCss . $sFile . '" />' . "\n";
         return $s;
     }
 

+ 13 - 1
install/css/styles.css

@@ -5,6 +5,10 @@ html, body {
 	height: 100%;
 }
 
+.bx-btn-primary {
+    background-color: #3b8686;
+}
+
 .bx-install-permissions .bx-btn,
 .bx-install-initial .bx-btn {
     display:inline;
@@ -18,10 +22,18 @@ html, body {
 .bx-install-site-config .bx-form-input-wrapper-submit {
     text-align:center;
 }
+.bx-install-initial > a,
+.bx-install-initial-langs > a,
+.bx-install-permissions-buttons > a,
+.bx-install-site-config .bx-form-input-wrapper-submit > a {
+    display:inline-block;
+}
 
 .bx-install-error-message {
     border:1px solid #966;
-    background-color:#c99
+    background-color:#c99;
+    color:#000;
+    font-weight:bold;
 }
 
 .bx-install-page {

+ 6 - 7
install/templates/_page.php

@@ -25,13 +25,12 @@
 
 <div class="bx-install-page bx-main">
 
-    <div id="bx-toolbar" class="bx-header bx-def-image-bg-header bx-def-color-bg-header bx-def-border-header bx-shadow-header bx-def-z-index-nav bx-toolbar-anim bx-toolbar-reset headroom--top">
+    <div id="bx-toolbar" class="bx-header bx-def-color-bg-header bx-def-z-index-nav bx-def-shadow bx-toolbar-anim headroom--top headroom--not-bottom">
         <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-            <div class="bx-toolbar-content-wrapper bx-content-padding-header">
-                <div id="bx-toolbar-content" class="bx-clearfix">
-                    <div id="bx-menu-toolbar-1-container"></div>
-                    <div id="bx-logo-container"><a class="bx-def-font-contrasted"><?=$sTitle; ?></a></div>
-                    <div id="bx-menu-toolbar-2-container">
+                <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
+                    <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left"></div>
+                    <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo bx-ti-stretcher"><a class="bx-def-font-contrasted"><span><?=$sTitle; ?></span></a></div>
+                    <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right">
                         <?php if (!empty($aToolbarItem)): ?>
                         <ul class="bx-menu-toolbar bx-menu-object-sys_toolbar_member">
                             <li class="bx-def-color-bg-hl-hover ">
@@ -43,7 +42,7 @@
                         <?php endif; ?>
                     </div>
                 </div>
-            </div>
+
         </div>
     </div>
 

+ 1 - 1
install/templates/finish.php

@@ -1,6 +1,6 @@
 <div class="bx-install-finish">
 
-    <h1><?php echo _t('_sys_inst_finish'); ?></h1>
+    <h1 class="bx-def-font-h1"><?php echo _t('_sys_inst_finish'); ?></h1>
 
     <p class="bx-def-font-large" style="font-weight:bold;"><?php echo _t('_sys_inst_msg_finish'); ?></p>
 

+ 1 - 1
install/templates/permissions.php

@@ -1,6 +1,6 @@
 <div class="bx-install-permissions">
 
-    <h1><?php echo _t('_adm_admtools_Permissions'); ?></h1>
+    <h1 class="bx-def-font-h1"><?php echo _t('_adm_admtools_Permissions'); ?></h1>
 
    <?=$sPermissionsStyles; ?>
    <?=$sPermissionsTable; ?>

+ 1 - 1
install/templates/site_config.php

@@ -1,6 +1,6 @@
 <div class="bx-install-site-config">
 
-    <h1><?php echo _t('_sys_inst_site_config'); ?></h1>
+    <h1 class="bx-def-font-h1"><?php echo _t('_sys_inst_site_config'); ?></h1>
 
    <?=$sForm; ?>
 

+ 1 - 1
studio/classes/BxDolStudioToolsAudit.php

@@ -517,7 +517,7 @@ class BxDolStudioToolsAudit extends BxDol
     protected function format_output ($mixedVal, $a)
     {
         if (isset($a['type']) && 'bytes' == $a['type'])
-            return _t_format_size($mixedVal);
+            return function_exists('_t_format_size') ? _t_format_size($mixedVal) : $mixedVal;
         if (isset($a['type']) && 'bool' == $a['type'])
             return $mixedVal ? 'On' : 'Off';
         else