From ad3231af73ddfb1cc8011a365720d5400e63e4b8 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Wed, 13 Apr 2011 16:52:07 -0500
Subject: [PATCH] change asset www_add and www_edit into templates

---
 lib/WebGUI/Asset.pm                           |  57 +++---------------
 lib/WebGUI/Operation/Settings.pm              |   9 +++
 .../7.10.4-8.0.0/addAssetEditTemplate.pl      |   9 +++
 .../root_import_adminconsole_edit-asset.wgpkg | Bin 0 -> 1941 bytes
 www/extras/css/wg-formbuilder.css             |  11 ++++
 5 files changed, 37 insertions(+), 49 deletions(-)
 create mode 100644 share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl
 create mode 100644 share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg
 create mode 100644 www/extras/css/wg-formbuilder.css

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 5d6958ce6..86e4bbc74 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2768,30 +2768,12 @@ sub www_add {
     $f->addField( "Hidden", name => "func", value => "addSave" );
     $f->action( $self->getUrl );
     $f->getTab('meta')->getField( 'className' )->set('value', $class);
-    # TODO: Make this whole thing a template instead!
-    $style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
-    $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
-    $style->setScript($url->extras('yui/build/element/element-min.js'));
-    $style->setScript($url->extras('yui/build/button/button-min.js'));
-    $style->setRawHeadTags(<<'ENDHTML'); 
-        <style type="text/css">
-            * { font: 12pt Helvetica, sans-serif; }
-            label.formDescription { display: block; margin-top: 1em; font-weight: bold }
-            .saveButtons { position: absolute; top: 3px; right: 5px; z-index: 9001; }
-        </style>
-        <script type="text/javascript">
-            YAHOO.util.Event.onDOMReady( function() {
-                new YAHOO.widget.Button( "saveButton" );
-                new YAHOO.widget.Button( "cancelButton" );
-                new YAHOO.widget.Button( "saveAndReturnButton" );
-                if ( document.getElementById( 'saveAndCommitButton' ) ) {
-                    new YAHOO.widget.Button('saveAndCommitButton');
-                }
-            } );
-        </script>
-ENDHTML
+
+    my $template    = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
+    $template->setParam( %{ $f->toTemplateVars } );
+
     return $self->session->style->process(
-        '<div class="yui-skin-sam">' . $f->toHtml . '</div>',
+        $template->process,
         "PBtmpl0000000000000137"
     );
 }
@@ -2940,34 +2922,11 @@ sub www_edit {
     $f->addField( "Hidden", name => "func", value => "editSave" );
     $f->action( $self->getUrl );
 
-    # TODO: Make this whole thing a template instead!
-    $style->setCss($url->extras('yui/build/button/assets/skins/sam/button.css'));
-    $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
-    $style->setScript($url->extras('yui/build/element/element-min.js'));
-    $style->setScript($url->extras('yui/build/button/button-min.js'));
-    $style->setRawHeadTags(<<'ENDHTML'); 
-        <style type="text/css">
-            * { font: 12pt Helvetica, sans-serif; }
-            label.formDescription { display: block; margin-top: 1em; font-weight: bold }
-            .saveButtons { position: absolute; top: 3px; right: 5px; z-index: 9001; }
-        </style>
-        <script type="text/javascript">
-            YAHOO.util.Event.onDOMReady( function() {
-                new YAHOO.widget.Button( "saveButton" );
-                new YAHOO.widget.Button( "cancelButton" );
-                new YAHOO.widget.Button( "saveAndReturnButton" );
-                if ( document.getElementById( 'saveAndCommitButton' ) ) {
-                    new YAHOO.widget.Button('saveAndCommitButton');
-                }
-            } );
-            if ( window.parent && window.parent.admin ) {
-                window.parent.admin.adminBar.show("assetHelpers");
-            }
-        </script>
-ENDHTML
+    my $template    = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
+    $template->setParam( %{ $f->toTemplateVars } );
 
     return $self->session->style->process(
-        '<div class="yui-skin-sam">' . $f->toHtml . '</div>',
+        $template->process,
         "PBtmpl0000000000000137"
     );
 }
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 1799d3df6..52ff65289 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -248,6 +248,15 @@ sub definition {
 		namespace=>"AdminConsole",
 		defaultValue=>$setting->get("AdminConsoleTemplate")
 		});
+    push @fields, {
+        tab             => 'ui',
+        fieldType       => 'template',
+        name            => 'templateIdAssetEdit',
+        label           => $i18n->get('templateIdAssetEdit label'),
+        hoverHelp       => $i18n->get('templateIdAssetEdit description'),
+        namespace       => 'Asset/Edit',
+        defaultValue    => $setting->get('templateIdAssetEdit') || "yKl2HX76TSuv42vmprFbXQ",
+    };
     push(@fields, {
         tab             => "ui",
         fieldType       => "yesNo",
diff --git a/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl b/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl
new file mode 100644
index 000000000..cd51c0625
--- /dev/null
+++ b/share/upgrades/7.10.4-8.0.0/addAssetEditTemplate.pl
@@ -0,0 +1,9 @@
+
+use WebGUI::Upgrade::Script;
+
+start_step "Adding Edit Asset Template";
+
+session->setting->set( 'templateIdAssetEdit' => 'yKl2HX76TSuv42vmprFbXQ' );
+
+done;
+
diff --git a/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_edit-asset.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..0ea83610c1248a671ad1f741df56941e1da986ab
GIT binary patch
literal 1941
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
b-n{T@-&gam2)rWjia_CSnNC4V03HAU&%MND

literal 0
HcmV?d00001

diff --git a/www/extras/css/wg-formbuilder.css b/www/extras/css/wg-formbuilder.css
new file mode 100644
index 000000000..ea4bd8c14
--- /dev/null
+++ b/www/extras/css/wg-formbuilder.css
@@ -0,0 +1,11 @@
+/**
+ * wg-formbuilder.css
+ * CSS rules for all forms built with WebGUI::FormBuilder
+ */
+
+.wg-formbuilder label.formDescription
+{
+    display: block;
+    margin-top: 1em;
+    font-weight: bold;
+}