Răsfoiți Sursa

changes by Roland

root 4 ani în urmă
părinte
comite
e487931dac

+ 1 - 1
app/UI/Client/Templates/assets/js/vm/create.js

@@ -38,7 +38,7 @@ $(document).ready(function () {
                 $('input[name="nameserver[1]"]').closest(".lu-form-group").hide();
             }
             //hide
-        }else{
+        } else {
             if($("#isoImage").size()){
                 $("#isoImage").closest(".lu-form-group").hide();
             }

+ 17 - 31
app/UI/VmCreate/Fields/OsTemplateSelect.php

@@ -12,17 +12,14 @@ use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Interfaces\ClientArea;
 use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Widget\Forms\AjaxFields\Select;
 use function ModulesGarden\Servers\ProxmoxCloudVps\Core\Helper\sl;
 
-class OsTemplateSelect extends Select implements ClientArea
-{
+class OsTemplateSelect extends Select implements ClientArea {
     use ProductService;
     use ApiService;
 
-    public function prepareAjaxData()
-    {
+    public function prepareAjaxData() {
         session_write_close();
         $advancedUser = new AdvancedUserHelper($this->getWhmcsParamByKey('userid'));
-        if ($this->configuration()->isQemu())
-        {
+        if ($this->configuration()->isQemu()) {
             $this->loadQemuTemplates();
 
 /*            if ($advancedUser->isAdvanced() || $this->configuration()->isPermissionIsoImage())
@@ -36,8 +33,7 @@ class OsTemplateSelect extends Select implements ClientArea
                 $this->callBackFunction = 'pcOsTemplateLoadShowIsoFields';
             } */
         }
-        if ($this->configuration()->isLxc())
-        {
+        if ($this->configuration()->isLxc())  {
             $this->loadLxcTemplates();
         }
         if($this->availableValues[0]['key']){
@@ -47,40 +43,31 @@ class OsTemplateSelect extends Select implements ClientArea
         $this->data['additionalData']['showItemDescription']  = true;
     }
 
-    private function defaultNode()
-    {
-        if ($this->getRequestValue('location'))
-        {
+    private function defaultNode()  {
+        if ($this->getRequestValue('location')) {
             return $this->getRequestValue('location');
-        }
-        else
-        {
+        } else {
             return $this->getNode()->getNode();
         }
     }
 
-    private function loadQemuTemplates()
-    {
+    private function loadQemuTemplates() {
         $clusterResurces = new ClusterResourcesRepository();
         $clusterResurces->findKvmTemplate();
         //default node
         $defaultNode = $this->defaultNode();
         //search templates on specific node
-        if (!$this->configuration()->isOsTemplatesInAllNodes())
-        {
+        if (!$this->configuration()->isOsTemplatesInAllNodes())  {
             $clusterResurces->findByNodes($defaultNode);
         }
 
         $VmList = $clusterResurces->fetchWithUniqueNames($defaultNode);
         usort($VmList, function($a, $b) {return strcmp($a->getName(), $b->getName());});
-        foreach ($VmList as $entity)
-        {
-            if ($entity->isCustom() && !$entity->matchName($this->getWhmcsParamByKey("serviceid")))
-            {
+        foreach ($VmList as $entity)    {
+            if ($entity->isCustom() && !$entity->matchName($this->getWhmcsParamByKey("serviceid")))  {
                 continue;
             }
-            if (!$entity->isCustom() && $this->configuration()->isPermissionOsTemplates() && !in_array($entity->getName(), $this->configuration()->getPermissionOsTemplates()))
-            {
+            if (!$entity->isCustom() && $this->configuration()->isPermissionOsTemplates() && !in_array($entity->getName(), $this->configuration()->getPermissionOsTemplates())) {
                 continue;
             }
             $id = "{$entity->getNode()}/{$entity->getVmid()}";
@@ -89,7 +76,9 @@ class OsTemplateSelect extends Select implements ClientArea
             if(!$description){
                 $description = $entity->getName();
             }
+            $description = str_replace('\n','<br />', $description);
             $desc = sl('lang')->abtr('template_desc',$description );
+            $desc = nl2br($desc);
 
             $this->availableValues[] = [
                 "key" => $id,
@@ -100,8 +89,7 @@ class OsTemplateSelect extends Select implements ClientArea
         }
     }
 
-    private function loadLxcTemplates()
-    {
+    private function loadLxcTemplates()   {
         $defaultNode = $this->defaultNode();
         $storageRepository = new StorageRepository();
         $storageRepository->findByNodes([$defaultNode])->findEnabed();
@@ -110,10 +98,8 @@ class OsTemplateSelect extends Select implements ClientArea
         $fileRepository->findLxcTemplates();
         $fileRepository->findByNodes([$defaultNode]);
         $fileRepository->findByStorages($storageRepository->fetchAsArray());
-        foreach ($fileRepository->fetch() as $file)
-        {
-            if ($this->configuration()->isPermissionOsTemplates() && !in_array($file->getVolid(), $this->configuration()->getPermissionOsTemplates()))
-            {
+        foreach ($fileRepository->fetch() as $file) {
+            if ($this->configuration()->isPermissionOsTemplates() && !in_array($file->getVolid(), $this->configuration()->getPermissionOsTemplates())) {
                 continue;
             }
             $this->availableValues[] = [

+ 2 - 4
app/UI/VmCreate/Sections/Qemu/GeneralSection.php

@@ -36,15 +36,13 @@ class GeneralSection extends HalfPageSection
      */
     protected $resourceManager;
 
-    public function initContent()
-    {
+    public function initContent()   {
         $this->initIds('generalSection');
         $this->resourceManager = new ResourceManager();
         $this->initFields();
     }
 
-    public function initFields()
-    {
+    public function initFields()  {
         $advancedUser = new AdvancedUserHelper($this->getWhmcsParamByKey('userid'));
         /**
          * @deprecated

+ 2 - 5
app/UI/VmCreate/Sections/TopSection.php

@@ -13,12 +13,10 @@ use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Widget\Forms\Fields\Textarea;
 use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Widget\Forms\Sections\RawSection;
 use function ModulesGarden\Servers\ProxmoxCloudVps\Core\Helper\sl;
 
-class TopSection extends RawSection
-{
+class TopSection extends RawSection {
     use ProductService;
 
-    public function initContent()
-    {
+    public function initContent() {
         //name
         $field = new Text('name');
         $field->addValidator(new HostnameValidator());
@@ -39,6 +37,5 @@ class TopSection extends RawSection
 
         $provider = new AccountSummaryProvider();
         $this->customTplVars['bars'] = $provider->read();
-
     }
 }

+ 1 - 2
app/UI/VmUpdate/Sections/Lxc/GeneralCombinedSection.php

@@ -17,7 +17,6 @@ use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Widget\Forms\Fields\Textarea;
 use ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Widget\Forms\Sections\BaseSection;
 use function ModulesGarden\Servers\ProxmoxCloudVps\Core\Helper\sl;
 
-class GeneralCombinedSection extends GeneralSection
-{
+class GeneralCombinedSection extends GeneralSection {
 
 }

+ 15 - 14
templates/client/default/assets/js/layers-ui.js

@@ -11693,24 +11693,25 @@ var DIACRITICS = {
 					return '<div class="optgroup-header">' + escape(data[field_optgroup]) + '</div>';
 				},
 				'option': function option(data, escape) {
-				    if(data.description)
-                    {
-                        return '<div class="option">'
-                            + '<div class="title">'+escape(data[field_label])+'</div>'
-                            + '<div class="desc">'
-                            + escape(data['description'])
-                            + '</div>'
-                            + '</div>';
-                    }
+				    if(data.description)  {
+	                        	return '<div class="option">'
+        	                	+ '<div class="title" style="font-size: 16px;">'+escape(data[field_label])+'</div>'
+                	    		+ '<div class="desc">'
+                        		//+ escape(data['description'])
+                        		+ data['description']
+                        		+ '</div>'
+                        	        + '</div>';
+                		    }
 					return '<div class="option">' + escape(data[field_label]) + '</div>';
 				},
 				'item': function item(data, escape) {
-                    if(data.description)
-                    {
+                    if(data.description)  {
+                	console.log("DESCRIPTION 2: " + data['description']);
                         return '<div class="item">'
-                            + '<div class="title">'+escape(data[field_label])+'</div>'
-                            + '<div class="desc">'
-                            + escape(data['description'])
+                            + '<div class="title" style="font-size: 16px;">'+escape(data[field_label])+'</div>'
+                            + '<div class="desc">'                            
+                            //+ escape(data['description'])
+                            + data['description']
                             + '</div>'
                             + '</div>';
                     }