Selaa lähdekoodia

customize buttons

root 4 vuotta sitten
vanhempi
commit
5dcd8697c9

BIN
app/UI/Client/Templates/assets/img/buttons/deleteButton.png


BIN
app/UI/Client/Templates/assets/img/buttons/novnc.png


BIN
app/UI/Client/Templates/assets/img/buttons/rebootButton.png


BIN
app/UI/Client/Templates/assets/img/buttons/shutdownButton.png


BIN
app/UI/Client/Templates/assets/img/buttons/startButton.png


BIN
app/UI/Client/Templates/assets/img/buttons/stopButton.png


+ 1 - 1
app/UI/Home/Buttons/DeleteVmButton.php

@@ -37,6 +37,6 @@ class DeleteVmButton extends AbstractActionButton implements ClientArea, AdminAr
 
 
     public function getImageUrl()
     public function getImageUrl()
     {
     {
-        return BuildUrl::getAppAssetsURL() . DS . 'img' . DS . 'buttons' . DS  . 'stopButton.png';
+        return BuildUrl::getAppAssetsURL() . DS . 'img' . DS . 'buttons' . DS  . 'deleteButton.png';
     }
     }
 }
 }

+ 1 - 1
app/UI/Home/Templates/pages/serviceActions.tpl

@@ -3,7 +3,7 @@
 <div class="lu-tiles lSu-row lu-row--eq-height">
 <div class="lu-tiles lSu-row lu-row--eq-height">
     <hr class="lu-m-v-2x"/>
     <hr class="lu-m-v-2x"/>
     {foreach from=$rawObject->getButtons() key=buttonId item=dataElement}
     {foreach from=$rawObject->getButtons() key=buttonId item=dataElement}
-    <div class="lu-col-sm-20p {if $buttonId == 'deleteVmButton'} lu-pull-right{/if}" style="justify-content: center;" data-button-id="{$buttonId}">
+    <div class="lu-col-sm-15p {if $buttonId == 'deleteVmButton'} lu-pull-right{/if}" style="justify-content: center;" data-button-id="{$buttonId}">
         <a class="lu-tile lu-tile--btn" {foreach $dataElement->getHtmlAttributes() as $aValue} {$aValue@key}="{$aValue}" {/foreach}
         <a class="lu-tile lu-tile--btn" {foreach $dataElement->getHtmlAttributes() as $aValue} {$aValue@key}="{$aValue}" {/foreach}
         data-title="{$MGLANG->absoluteT('buttons','actions', $dataElement->getTitle())}">
         data-title="{$MGLANG->absoluteT('buttons','actions', $dataElement->getTitle())}">
         <div class="lu-i-c-6x">
         <div class="lu-i-c-6x">

+ 6 - 3
app/UI/ServiceInformation/Templates/pages/serviceInformation_components.tpl

@@ -7,12 +7,13 @@
 
 
     <div class="lu-row lu-row--eq-height {$rawObject->getClasses()}" id="{$rawObject->getId()}" namespace="{$namespace}"
     <div class="lu-row lu-row--eq-height {$rawObject->getClasses()}" id="{$rawObject->getId()}" namespace="{$namespace}"
          index="{$rawObject->getIndex()}" actionid="{$rawObject->getIndex()}">
          index="{$rawObject->getIndex()}" actionid="{$rawObject->getIndex()}">
-        <div class="lu-preloader-container lu-preloader-container--full-screen lu-preloader-container--overlay"
-             v-if="loading_state">
+        <div class="lu-preloader-container lu-preloader-container--full-screen lu-preloader-container--overlay" v-if="loading_state">
             <div class="lu-preloader lu-preloader--sm"></div>
             <div class="lu-preloader lu-preloader--sm"></div>
         </div>
         </div>
         <div class="col-md-12">
         <div class="col-md-12">
-            <h4 v-if="data.status"><span>{literal}{{ data.config.name  }} {/literal} </span></h4>
+            <h4 v-if="data.status"><span style="font-weight: 700; color: #336699;">{literal}{{ data.config.name  }} {/literal} </span></h4>
+            <span class="lu-list__value" style="margin-top: -15px;">{literal}{{ data.description}}{/literal}</span>
+            <br />
             <ul class="lu-list lu-list--info">
             <ul class="lu-list lu-list--info">
                 <li class="lu-list__item">
                 <li class="lu-list__item">
                     <span class="lu-list__item-title">{$MGLANG->tr('Status')}</span>
                     <span class="lu-list__item-title">{$MGLANG->tr('Status')}</span>
@@ -36,10 +37,12 @@
                     <span class="lu-list__item-title">{$MGLANG->tr('Created At')}</span>
                     <span class="lu-list__item-title">{$MGLANG->tr('Created At')}</span>
                     <span class="lu-list__value">{literal}{{ data.created_at }}{/literal}</span>
                     <span class="lu-list__value">{literal}{{ data.created_at }}{/literal}</span>
                 </li>
                 </li>
+                <!--
                 <li class="lu-list__item">
                 <li class="lu-list__item">
                     <span class="lu-list__item-title">{$MGLANG->translate('description')}</span>
                     <span class="lu-list__item-title">{$MGLANG->translate('description')}</span>
                     <span class="lu-list__value">{literal}{{ data.description}}{/literal}</span>
                     <span class="lu-list__value">{literal}{{ data.description}}{/literal}</span>
                 </li>
                 </li>
+                -->
             </ul>
             </ul>
         </div>
         </div>
     </div>
     </div>

+ 4 - 4
langs/german.php

@@ -656,7 +656,7 @@ $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection'][
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStart]']['tip'] = 'If enabled, a client will be able to perform the "Boot" action on their server';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStart]']['tip'] = 'If enabled, a client will be able to perform the "Boot" action on their server';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStop]']['customconfigoption[permissionStop]'] = 'Stop';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStop]']['customconfigoption[permissionStop]'] = 'Stop';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStop]']['tip'] = 'If enabled, a client will be able to perform the "Stop" action on their server';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionStop]']['tip'] = 'If enabled, a client will be able to perform the "Stop" action on their server';
-$_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionNovnc]']['customconfigoption[permissionNovnc]'] = 'noVNC Console';
+$_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionNovnc]']['customconfigoption[permissionNovnc]'] = 'Server Console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionNovnc]']['tip'] = 'If enabled, a client will be able to access the noVNC console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionNovnc]']['tip'] = 'If enabled, a client will be able to access the noVNC console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionXtermjs]']['customconfigoption[permissionXtermjs]'] = 'Xterm.js Console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionXtermjs]']['customconfigoption[permissionXtermjs]'] = 'Xterm.js Console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionXtermjs]']['tip'] = 'If enabled, a client will be able to access the Xterm.js console';
 $_LANG['serverAA']['product']['mainContainer']['mainForm']['clientAreaSection']['leftSection']['customconfigoption[permissionXtermjs]']['tip'] = 'If enabled, a client will be able to access the Xterm.js console';
@@ -1022,7 +1022,7 @@ $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['vcpus'] = 'vC
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['memory'] = 'Memory';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['memory'] = 'Memory';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['disk'] = 'Disk';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['disk'] = 'Disk';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['osTemplate'] = 'OS Template';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['table']['osTemplate'] = 'OS Template';
-$_LANG['serverCA']['home']['mainContainer']['dataTable']['consoleButton']['button']['consoleButton'] = 'noVNC Konsole';
+$_LANG['serverCA']['home']['mainContainer']['dataTable']['consoleButton']['button']['consoleButton'] = 'Serverkonsole';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['redirectButton']['button']['redirectButton'] = 'VMs verwalten';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['redirectButton']['button']['redirectButton'] = 'VMs verwalten';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['deleteButton']['button']['deleteButton'] = 'Löschen';
 $_LANG['serverCA']['home']['mainContainer']['dataTable']['deleteButton']['button']['deleteButton'] = 'Löschen';
 $_LANG['stopped'] = 'gestoppt';
 $_LANG['stopped'] = 'gestoppt';
@@ -1185,8 +1185,8 @@ $_LANG['buttons']['actions']['stopButton'] = 'Stop';
 $_LANG['serverCA']['iconTitle']['stopButton'] = 'Stop';
 $_LANG['serverCA']['iconTitle']['stopButton'] = 'Stop';
 $_LANG['buttons']['actions']['shutdownButton'] = 'Herunterfahren';
 $_LANG['buttons']['actions']['shutdownButton'] = 'Herunterfahren';
 $_LANG['serverCA']['iconTitle']['shutdownButton'] = 'Herunterfahren';
 $_LANG['serverCA']['iconTitle']['shutdownButton'] = 'Herunterfahren';
-$_LANG['buttons']['actions']['novnc'] = 'noVNC Konsole';
-$_LANG['serverCA']['iconTitle']['novnc'] = 'noVNC Konsole';
+$_LANG['buttons']['actions']['novnc'] = 'Serverkonsole';
+$_LANG['serverCA']['iconTitle']['novnc'] = 'Serverkonsole';
 $_LANG['buttons']['actions']['spice'] = 'Spice Konsole';
 $_LANG['buttons']['actions']['spice'] = 'Spice Konsole';
 $_LANG['serverCA']['iconTitle']['spice'] = 'Spice Konsole';
 $_LANG['serverCA']['iconTitle']['spice'] = 'Spice Konsole';
 $_LANG['buttons']['actions']['xtermjs'] = 'Xterm.js Konsole';
 $_LANG['buttons']['actions']['xtermjs'] = 'Xterm.js Konsole';

+ 23 - 5
templates/client/default/assets/css/layers-ui.css

@@ -1155,18 +1155,34 @@
 @media (min-width: 514px) {
 @media (min-width: 514px) {
   .lu-col-sm-20p {
   .lu-col-sm-20p {
     -webkit-box-flex: 0;
     -webkit-box-flex: 0;
-    flex: 0 0 20%;
-    max-width: 20%;
+    flex: 0 0 16%;
+    max-width: 16%;
+    padding-right: 8px;
+    padding-left: 8px;
+  }
+  .lu-col-sm-15p {
+    -webkit-box-flex: 0;
+    flex: 0 0 15%;
+    max-width: 15%;
     padding-right: 8px;
     padding-right: 8px;
     padding-left: 8px;
     padding-left: 8px;
   }
   }
 }
 }
 
 
+.lu-col-sm-15p {
+    -webkit-box-flex: 0;
+    flex: 0 0 15%;
+    max-width: 15%;
+    padding-right: 8px;
+    padding-left: 8px;
+}
+
+
 @media (min-width: 752px) {
 @media (min-width: 752px) {
   .lu-col-md-20p {
   .lu-col-md-20p {
     -webkit-box-flex: 0;
     -webkit-box-flex: 0;
-    flex: 0 0 20%;
-    max-width: 20%;
+    flex: 0 0 16%;
+    max-width: 16%;
     padding-right: 8px;
     padding-right: 8px;
     padding-left: 8px;
     padding-left: 8px;
   }
   }
@@ -16267,7 +16283,9 @@ Rail
 
 
 #layers .lu-nav__item.is-active > .lu-nav__link,
 #layers .lu-nav__item.is-active > .lu-nav__link,
 #layers .lu-nav__item.is-active > .lu-nav__link > .lu-nav__link-icon {
 #layers .lu-nav__item.is-active > .lu-nav__link > .lu-nav__link-icon {
-  color: #62CA5F;
+  background-color: #336699;
+  color: white;
+/*  color: #62CA5F; */
 }
 }
 
 
 #layers .lu-nav__link {
 #layers .lu-nav__link {

+ 3 - 3
templates/client/default/ui/core/default/widget/forms/formTabsWidget.tpl

@@ -36,12 +36,12 @@
                     </div>
                     </div>
                 </div>
                 </div>
             {/if}
             {/if}
-            <div class="lu-widget__nav swiper-container swiper-container-horizontal swiper-container-false" data-content-slider="" style="visibility: visible;">
+            <div class="lu-widget__nav swiper-container swiper-container-horizontal swiper-container-false" data-content-slider="" style="visibility: visible; margin-left: unset; margin-right: unset;">
                 {assign var="firstArrKey" value=$rawObject->getSections()|array_keys}
                 {assign var="firstArrKey" value=$rawObject->getSections()|array_keys}
                 {if $rawObject->getSections()}
                 {if $rawObject->getSections()}
-                    <ul class="swiper-wrapper lu-nav lu-nav--md lu-nav--h lu-nav--tabs lu-nav--arrow">
+                    <ul class="swiper-wrapper lu-nav lu-nav--md lu-nav--h lu-nav--tabs lu-nav--arrow" style="width: 100%; display: table;">
                         {foreach from=$rawObject->getSections() key=tplKey item=tplValue}
                         {foreach from=$rawObject->getSections() key=tplKey item=tplValue}
-                            <li {if $tplKey  === $firstArrKey[0]} class="lu-nav__item swiper-slide is-active" {else} class="lu-nav__item swiper-slide" {/if}>
+                            <li {if $tplKey  === $firstArrKey[0]} class="lu-nav__item swiper-slide is-active" {else} class="lu-nav__item swiper-slide" {/if} style="display: table-cell">
                                 <a class="lu-nav__link"  data-toggle="lu-tab" href="#contTab{$tplValue->getId()}">
                                 <a class="lu-nav__link"  data-toggle="lu-tab" href="#contTab{$tplValue->getId()}">
                                     <span class="lu-nav__link-text">{if $tplValue->isRawTitle()}{$tplValue->getRawTitle()}{elseif $tplValue->getTitle()}{$MGLANG->T($tplValue->getTitle())}{/if}</span>
                                     <span class="lu-nav__link-text">{if $tplValue->isRawTitle()}{$tplValue->getRawTitle()}{elseif $tplValue->getTitle()}{$MGLANG->T($tplValue->getTitle())}{/if}</span>
                                 </a>
                                 </a>