Form module style cleanup, along with the addition of a "notice" styl…

…e for the message queue.

datatypes/formbuilder_form.php

@@ -58,6 +58,7 @@ function form($object) {
 
 		// Get User list
     	$userlist = array();
+    	$defaults = array();
 		$users = exponent_users_getAllUsers();
 		foreach ($db->selectObjects('formbuilder_address','form_id='.$object->id.' and user_id != 0') as $address) {
 			$locuser =  exponent_users_getUserById($address->user_id);

framework/core/assets/css/msgq.css

@@ -21,21 +21,25 @@ div.msg-queue.error {
     border: 2px solid #ff0000;
     color: #ff0000;
 }
+
+div.msg-queue.notice {
+    background: #f1e778;
+    border: 2px solid #c59207;
+    color: #c59207;
+}
+
 .msg-queue {
     position:relative;
 }
 
 .msg-queue .close {
     position:absolute;
-    top:5px;
-    right:5px;
+    top:3px;
+    right:3px;
     display:block;
     width:16px;
     height:0px;
     padding-top:16px;
     overflow:hidden;
-    background:url(../images/exp-admin-sprite.png) no-repeat 0px -480px;
-}
-.msg-queue.error .close {
-    background:url(../images/exp-admin-sprite.png) no-repeat 0px -510px;
+    background:url(../images/exp-admin-sprite.png) no-repeat 0px -511px;
 }

modules/formmodule/class.php

@@ -130,7 +130,9 @@ function show($view,$loc = null) {
 			$template = new template("formmodule",$view,$loc);
 			$template->assign("moduletitle",$f->name);
 			$template->assign("description",$f->description);
-			$template->assign("formmsg",$formmsg);
+			if ($formmsg) {
+                flash('notice',$formmsg);
+			}
 			$template->assign("form_html",$form->toHTML($f->id));
 			$template->assign("form",$f);
 			$template->register_permissions(array("administrate","editform","editformsettings","editreport","viewdata","editdata","deletedata"),$loc);

modules/formmodule/views/Default.tpl

@@ -19,6 +19,7 @@
 {/css}
 
 <div class="formmodule default"> 
+    {messagequeue}
 	{permissions}
 		{if $permissions.viewdata == 1 && $form->is_saved == 1}<a class="addnew mngmntlink" href="{link action=view_data module=formbuilder id=$form->id}">{$_TR.view_data}</a>&nbsp;&nbsp;{/if}
 		{if $permissions.viewdata == 1 && $form->is_saved == 1}|&nbsp;&nbsp;<a class="addnew mngmntlink" href="{link action=export_csv module=formbuilder id=$form->id}">{$_TR.export_cvs}</a>&nbsp;&nbsp;
@@ -30,14 +31,11 @@
 		{if $permissions.editreport == 1}|&nbsp;&nbsp;<a class="addnew mngmntlink" href="{link action=edit_report module=formbuilder id=$form->id}">{$_TR.edit_report}</a>&nbsp;&nbsp;{/if}
 	{/permissions}
 	{if $moduletitle != ""}<h2>{$moduletitle}</h2>{/if}
-	{if $formmsg != "" }
-  {br}{br}
-		{$formmsg}
-	{/if}
-	{if $description != ""}
-		{$description}
-	{/if}
-	 <div style="border: padding: 1em;">
+	 <div class="bodycopy">
+	     {$description}
+    	{if $description != ""}
+    		{$description}
+    	{/if}
 		{$form_html}
 	</div>
 </div>