Merge branch 'pr/1924' into 24.08.00

PTFS-Europe · Jul 29, 2024 · de982bd · de982bd
2 parents ced7941 + 59e7ba4
commit de982bd
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 4 deletions.
diff --git a/code/web/interface/themes/responsive/WebBuilder/createTemplatejs.tpl b/code/web/interface/themes/responsive/WebBuilder/createTemplatejs.tpl
@@ -147,6 +147,14 @@
         z-index: 1;
         position: relative;
     }
+    .fa-save {
+      background-color: #3174AF;
+      border: 1px solid #3174AF;
+    }
+
+    .gjs-block-label {
+      font-size: 10px;
+    }
     </style>
 </body>
 

diff --git a/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl b/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl
@@ -2,6 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
+    {if $canEdit}
+      <div style="position:absolute;top:50px;right:10px"><button onclick="window.location.href='{$editPageUrl|escape: 'html'}'">{translate text="Edit Page" isPublicFacing=false}</button></div>
+    {/if}
     <title>{$title|escape: 'html'}</title>
   </head>
   <body>

diff --git a/code/web/interface/themes/responsive/WebBuilder/grapesjs.tpl b/code/web/interface/themes/responsive/WebBuilder/grapesjs.tpl
@@ -146,6 +146,15 @@
       z-index: 1;
       position: relative;
     }
+
+    .fa-save {
+      background-color: #3174AF;
+      border: 1px solid #3174AF;
+    }
+
+    .gjs-block-label {
+      font-size: 10px;
+    }
   </style>
 </body>
 </html>
diff --git a/code/web/release_notes/24.08.00.MD b/code/web/release_notes/24.08.00.MD
@@ -84,6 +84,9 @@
 - Added ability to create templates that can be selected and used for Grapes Pages (*AB*)
 - Added Grapes Pages to Web Indexer so that Grapes Pages are displayed in line with other WebBuilder pages when url is navigated to. (*AB*)
 - Add a switch to disable grapes pages during testing period. (*MDN*)
+- Added the option to create a Grapes Page from no template. (*AB*)
+- Increased the font size of the labels for the Grapes JS components (*AB*)
+- Added a blue background to the save button on the Grapes JS Editor in order to make it easier for users to find (*AB*)
 
 // jacob
 

diff --git a/code/web/services/WebBuilder/GrapesPage.php b/code/web/services/WebBuilder/GrapesPage.php
@@ -42,7 +42,11 @@ function launch() {
 		$title = $this->grapesPage->title;
 		$interface->assign('id', $this->grapesPage->id);
 		$interface->assign('contents', $this->grapesPage->getFormattedContents());
-
+		$editButton = $this->generateEditPageUrl();
+		$interface->assign('editPageUrl', $editButton);
+		$canEdit = UserAccount::userHasPermission(	'Administer All Grapes Pages',
+		'Administer Library Grapes Pages');
+		$interface->assign('canEdit', $canEdit);
 		// $interface->assign('templateContent', $this->grapesPage->templateContent);
 		// $interface->assign('title', $title);
 
@@ -62,6 +66,12 @@ function canView(): bool {
 		return true;
 	}
 
+	function generateEditPageUrl() {
+		$objectId = $this->grapesPage->id;
+		$templatesSelect - $this->grapesPage->templatesSelect;
+		return '/services/WebBuilder/GrapesJSEditor?objectAction=edit&id=' . $objectId . '&tempalteId=' . $templatesSelect;
+	}
+
 	function getBreadcrumbs(): array {
 		$breadcrumbs = [];
 		$breadcrumbs[] = new Breadcrumb('/', 'Home');

diff --git a/code/web/sys/DBMaintenance/grapes_web_builder_updates.php b/code/web/sys/DBMaintenance/grapes_web_builder_updates.php
@@ -75,6 +75,13 @@ function getGrapesWebBuilderUpdates() {
 			'sql' => [
 				"ALTER TABLE system_variables ADD COLUMN enableGrapesEditor TINYINT(1) DEFAULT 0"
 			],
-		]
-	];
-}
+		],
+		'add_a_blank_template_to_template_list' => [
+			'title' => 'Add a blank template to list',
+			'description' => 'Add a blank template to template list',
+			'sql' => [
+				"INSERT INTO templates (templateName, templateContent) VALUES ('No Template', ' ')",
+			],
+		],
+   ];
+}
diff --git a/code/web/sys/WebBuilder/GrapesPage.php b/code/web/sys/WebBuilder/GrapesPage.php
@@ -44,6 +44,7 @@ static function getObjectStructure($context = ''): array {
 				'description' => 'The title of the page',
 				'size' => '40',
 				'maxLength' => 100,
+				'required' => true,
 			],
 			'urlAlias' => [
 				'property' => 'urlAlias',
@@ -52,6 +53,7 @@ static function getObjectStructure($context = ''): array {
 				'description' => 'The url of the page (no domain name)',
 				'size' => '40',
 				'maxLength' => 100,
+				'required' => true, 
 			],
 			'teaser' => [
 				'property' => 'teaser',