ENHANCEMENT: Apply bootstrap forms to UserDefinedForm and Security

Author: unclecheese

README.md

@@ -12,8 +12,3 @@
 if(!class_exists("GridField")) {
 	user_error("The bootstrap_forms module requires SilverStripe 3.0 or greater.", E_USER_ERROR);
 }
-Object::add_extension("FormField", "BootstrapFormField");
-Object::add_extension("TextField", "BootstrapTextField");
-Object::add_extension("OptionsetField", "BootstrapOptionsetField");
-Object::add_extension("FormAction","BootstrapFormAction");
-Object::add_extension("TextareaField", "BootstrapTextField");

_config.php

@@ -0,0 +1,34 @@
+name: BootstrapForm
+---
+BootstrapForm:
+  bootstrap_included: false
+  jquery_included: false
+FormField:
+  extensions:
+    - BootstrapFormField
+TextField:
+  extensions:
+    - BootstrapTextField
+OptionsetField:
+  extensions:
+    - BootstrapOptionsetField
+FormAction:
+  extensions:
+    - BootstrapFormAction
+TextareaField:
+  extensions:
+    - BootstrapTextField
+FieldList:
+  extensions:
+    - BootstrapFieldList
+Injector:
+  MemberLoginForm:
+    class: BootstrapMemberLoginForm
+---
+only:
+  moduleexists: userforms
+---
+UserDefinedForm_Controller:
+  extensions:
+    - BootstrapUserForm
+---

_config/config.yml

@@ -0,0 +1,46 @@
+<?php
+
+
+class BootstrapFieldList extends Extension {
+
+
+	public function bootstrapify() {
+		foreach($this->owner as $f) {
+
+			// If we have a Tabset, bootstrapify all Tabs
+			if($f instanceof TabSet) {
+				$f->Tabs()->bootstrapify();
+			}
+
+			// If we have a Tab, bootstrapify all its Fields
+			if($f instanceof Tab) {
+				$f->Fields()->bootstrapify();
+			}
+			
+
+			$template = "Bootstrap{$f->class}_holder";			
+			if(SSViewer::hasTemplate($template)) {					
+				$f->setFieldHolderTemplate($template);				
+			}
+			else {				
+				$f->setFieldHolderTemplate("BootstrapFieldHolder");
+			}
+
+			foreach(array_reverse(ClassInfo::ancestry($f)) as $className) {						
+				$bootstrapCandidate = "Bootstrap{$className}";
+				$nativeCandidate = $className;
+				if(SSViewer::hasTemplate($bootstrapCandidate)) {
+					$f->setTemplate($bootstrapCandidate);
+					break;
+				}
+				elseif(SSViewer::hasTemplate($nativeCandidate)) {
+					$f->setTemplate($nativeCandidate);
+					break;
+				}
+			}
+		}
+
+		return $this->owner;		
+
+	}
+}

code/BootstrapFieldList.php

@@ -12,21 +12,6 @@
  */
 class BootstrapForm extends Form {
 
-	
-	/**
-	 * @var bool If true, the Bootstrap CSS will not be included in order
-	 *			to avoid collisions
-	 */
-	protected static $bootstrap_included = false;
-
-
-
-	/**
-	 * @var bool If true, jQuery will not be included in order
-	 *			to avoid collisions
-	 */
-	protected static $jquery_included = false;
-
 
 
 
@@ -49,10 +34,11 @@ class BootstrapForm extends Form {
 	/**
 	 * Sets form to disable/enable inclusion of Bootstrap CSS
 	 *
+	 * @deprecated In 3.1
 	 * @param bool $bool
 	 */
 	public static function set_bootstrap_included($bool = true) {
-		self::$bootstrap_included = $bool;
+		Config::inst()->set("BootstrapForm","bootstrap_included",$bool);
 	}
 
 
@@ -61,10 +47,11 @@ public static function set_bootstrap_included($bool = true) {
 	/**
 	 * Sets form to disable/enable inclusion of jQuery
 	 *
+	 * @deprecated In 3.1
 	 * @param bool $bool
 	 */
 	public static function set_jquery_included($bool = true) {
-		self::$jquery_included = $bool;
+		Config::inst()->set("BootstrapForm","jquery_included",$bool);
 	}
 
 
@@ -76,40 +63,7 @@ public static function set_jquery_included($bool = true) {
 	 * @param FieldList $fields
 	 */
 	public static function apply_bootstrap_to_fieldlist($fields) {
-		foreach($fields as $f) {
-
-			// If we have a Tabset, bootstrapify all Tabs
-			if($f instanceof TabSet) {
-				self::apply_bootstrap_to_fieldlist($f->Tabs());				
-			}
-
-			// If we have a Tab, bootstrapify all its Fields
-			if($f instanceof Tab) {
-				self::apply_bootstrap_to_fieldlist($f->Fields());
-			}
-			
-
-			$template = "Bootstrap{$f->class}_holder";			
-			if(SSViewer::hasTemplate($template)) {					
-				$f->setFieldHolderTemplate($template);				
-			}
-			else {				
-				$f->setFieldHolderTemplate("BootstrapFieldHolder");
-			}
-
-			foreach(array_reverse(ClassInfo::ancestry($f)) as $className) {						
-				$bootstrapCandidate = "Bootstrap{$className}";
-				$nativeCandidate = $className;
-				if(SSViewer::hasTemplate($bootstrapCandidate)) {
-					$f->setTemplate($bootstrapCandidate);
-					break;
-				}
-				elseif(SSViewer::hasTemplate($nativeCandidate)) {
-					$f->setTemplate($nativeCandidate);
-					break;
-				}
-			}
-		}		
+		$fields->bootstrapify();
 	}
 
 

code/BootstrapForm.php

@@ -0,0 +1,15 @@
+<?php
+
+class BootstrapMemberLoginForm extends MemberLoginForm {
+
+
+	public function __construct($controller = null, $name = null, $fields = null, $actions = null, $checkCurrentUser = true) {
+		if(!$controller) $controller = Controller::curr();
+		if(!$name) $name = "LoginForm";
+		parent::__construct($controller, $name, $fields, $actions, $checkCurrentUser);
+		$this->Fields()->bootstrapify();
+		$this->Actions()->bootstrapify();
+		$this->setTemplate("BootstrapForm");
+	}
+
+}

code/BootstrapFormAction.php

@@ -0,0 +1,15 @@
+<?php
+
+
+
+class BootstrapUserForm extends Extension {
+
+
+
+	public function updateForm($form) {
+		$form->Fields()->bootstrapify();
+		$form->Actions()->bootstrapify();
+		$form->setTemplate("BootstrapForm");
+	}
+
+}

code/BootstrapFormField.php

@@ -1,3 +1,4 @@
+       
         <% if Options.Count %>
             <% loop Options %>
                 <label class="radio <% if Top.Inline %>inline<% end_if %>" for="$ID">