OO-1068 more fixes in ac, adding status icons

src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java

@@ -426,6 +426,18 @@ public abstract class FormBasicController extends BasicController {
 			flc.contextPut("off_title", getTranslator().translate(i18nKey, args));
 		}
 	}
+	
+	/**
+	 * Set an optional icon by giving the necessary css classes
+	 * @param iconCss 
+	 */
+	protected void setFormTitleIconCss(String iconCss) {
+		if (iconCss == null) {
+			flc.contextRemove("off_icon");
+		} else {
+			flc.contextPut("off_icon", iconCss);
+		}
+	}
 
 	/**
 	 * Set an optional description. This will appear above the form. If you use a

src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default.html

 ## for odd reason bootstrap calls vertial horizontal
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-horizontal #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
 #if ($off_title && $off_chelp_package) 
-	<legend>
+	<legend>		
 		#if ($off_chelp_package) 
 			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
 		#end
+		#if ($off_icon)
+			<i class="$off_icon"> </i>
+		#end
 		$!off_title
 	</legend> 
 #elseif ($off_title) 
-	<legend>$!off_title</legend> 
+	<legend>	
+		#if ($off_icon)
+			<i class="$off_icon"> </i>
+		#end
+		$!off_title
+	</legend> 
 #elseif ($off_chelp_package) 
 	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover")</div>
 #end

src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html

@@ -5,6 +5,9 @@
 	#if ($off_chelp_package) 
 		$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
 	#end
+	#if ($off_icon)
+		<i class="$off_icon"> </i>
+	#end
 	$!off_title
 </legend> 
 #end

src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html

@@ -4,6 +4,9 @@
 	#if ($off_chelp_package) 
 		$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
 	#end
+	#if ($off_icon)
+		<i class="$off_icon"> </i>
+	#end
 	$!off_title
 </legend> 
 #end 

src/main/java/org/olat/resource/accesscontrol/provider/free/ui/FreeAccessController.java

@@ -33,6 +33,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
 import org.olat.resource.accesscontrol.model.OfferAccess;
+import org.olat.resource.accesscontrol.provider.free.FreeAccessHandler;
 import org.olat.resource.accesscontrol.ui.AccessEvent;
 import org.olat.resource.accesscontrol.ui.FormController;
 
@@ -73,6 +74,7 @@ public class FreeAccessController extends FormBasicController implements FormCon
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("access.free.title");
 		setFormDescription("access.free.desc");
+		setFormTitleIconCss("o_icon o_icon-fw " + FreeAccessHandler.METHOD_CSS_CLASS + "_icon");
 		
 		String description = link.getOffer().getDescription();
 		if(StringHelper.containsNonWhitespace(description)) {

src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessController.java

@@ -35,6 +35,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.model.OfferAccess;
 import org.olat.resource.accesscontrol.model.Price;
+import org.olat.resource.accesscontrol.provider.paypal.PaypalAccessHandler;
 import org.olat.resource.accesscontrol.provider.paypal.manager.PaypalManager;
 import org.olat.resource.accesscontrol.provider.paypal.model.PaypalTransaction;
 import org.olat.resource.accesscontrol.provider.paypal.model.PaypalTransactionStatus;
@@ -90,6 +91,7 @@ public class PaypalAccessController extends FormBasicController implements FormC
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("access.paypal.title");
 		setFormDescription("access.paypal.desc");
+		setFormTitleIconCss("o_icon o_icon-fw " + PaypalAccessHandler.METHOD_CSS_CLASS + "_icon");
 		
 		String uuid = (String)ureq.getUserSession().getEntry("paypal-uuid");
 		if(StringHelper.containsNonWhitespace(uuid)) {

src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalTransactionStatusRenderer.java

@@ -61,26 +61,26 @@ public class PaypalTransactionStatusRenderer  implements CustomCellRenderer {
 				
 				if(trxStatus == null) {
 					if(status == PaypalTransactionStatus.SUCCESS) {
-						sb.append("<span class='b_with_small_icon_left b_transaction_status_success_icon'></span>");
+						sb.append("<i class='o_icon o_icon-fw o_ac_status_success_icon'></i>");
 					}	else if(status == PaypalTransactionStatus.PENDING) {
-						sb.append("<span class='b_with_small_icon_left b_transaction_status_waiting_icon'></span>");
+						sb.append("<i class='o_icon o_icon-fw o_ac_status_waiting_icon'></i>");
 					} else if(status == PaypalTransactionStatus.NEW || status == PaypalTransactionStatus.PREPAYMENT) {
-						sb.append("<span class='b_with_small_icon_left b_transaction_status_new_icon'></span>");
+						sb.append("<i class='o_icon o_icon-fw o_ac_status_new_icon'></i>");
 					} else if(status == PaypalTransactionStatus.CANCELED) {
-						sb.append("<span class='b_with_small_icon_left b_transaction_status_canceled_icon'></span>");
+						sb.append("<i class='o_icon o_icon-fw o_ac_status_canceled_icon'></i>");
 					}	else {
-						sb.append("<span class='b_with_small_icon_left b_transaction_status_error_icon'></span>");
+						sb.append("<i class='o_icon o_icon-fw o_ac_status_error_icon'></i>");
 					}
 				} else if("SUCCESS".equalsIgnoreCase(trxStatus) || "CREATED".equalsIgnoreCase(trxStatus)
 						|| "PARTIALLY_REFUNDED".equalsIgnoreCase(trxStatus) || "Completed".equalsIgnoreCase(trxStatus)) {
-					sb.append("<span class='b_with_small_icon_left b_transaction_status_success_icon'></span>");
+					sb.append("<i class='o_icon o_icon-fw o_ac_status_success_icon'></i>");
 				} else if("PROCESSING".equalsIgnoreCase(trxStatus) || "PENDING".equalsIgnoreCase(trxStatus)) {
-					sb.append("<span class='b_with_small_icon_left b_transaction_status_waiting_icon'></span>");
+					sb.append("<i class='o_icon o_icon-fw o_ac_status_waiting_icon'></i>");
 				} else {
-					sb.append("<span class='b_with_small_icon_left b_transaction_status_error_icon'></span>");
+					sb.append("<i class='o_icon o_icon-fw o_ac_status_error_icon'></i>");
 				}
 			} else {
-				sb.append("<span class='b_with_small_icon_left b_transaction_status_error_icon'></span>");
+				sb.append("<i class='o_icon o_icon-fw o_ac_status_error_icon'></i>");
 			}
 		}
 	}

src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessController.java

@@ -34,6 +34,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
 import org.olat.resource.accesscontrol.model.OfferAccess;
+import org.olat.resource.accesscontrol.provider.token.TokenAccessHandler;
 import org.olat.resource.accesscontrol.ui.AccessEvent;
 import org.olat.resource.accesscontrol.ui.FormController;
 
@@ -75,6 +76,7 @@ public class TokenAccessController extends FormBasicController implements FormCo
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("access.token.title");
 		setFormDescription("access.token.desc");
+		setFormTitleIconCss("o_icon o_icon-fw " + TokenAccessHandler.METHOD_CSS_CLASS + "_icon");
 		
 		String description = link.getOffer().getDescription();
 		if(StringHelper.containsNonWhitespace(description)) {

src/main/java/org/olat/resource/accesscontrol/ui/OrderStatusRenderer.java

@@ -46,16 +46,16 @@ public class OrderStatusRenderer implements CustomCellRenderer {
 		if(val instanceof OrderStatus) {
 			OrderStatus status = (OrderStatus)val;
 			String name = status.name().toLowerCase();
-			sb.append("<span class='b_with_small_icon_left b_order_status_");
+			sb.append("<i class='o_icon o_icon-fw o_ac_order_status_");
 			sb.append(name);
-			sb.append("_icon'></span>");
+			sb.append("_icon'> </i>");
 		} else if (val instanceof OrderTableItem) {
 			OrderTableItem item = (OrderTableItem)val;
 			switch(item.getStatus()) {
-				case ERROR: sb.append("<span class='b_with_small_icon_left b_order_status_error_icon'></span>"); break;
-				case WARNING: sb.append("<span class='b_with_small_icon_left b_order_status_warning_icon'></span>"); break;
-				case CANCELED: sb.append("<span class='b_with_small_icon_left b_order_status_canceled_icon'></span>"); break;
-				default: sb.append("<span class='b_with_small_icon_left b_order_status_payed_icon'></span>");
+				case ERROR: sb.append("<i class='o_icon o_icon-fw o_ac_order_status_error_icon'></i>"); break;
+				case WARNING: sb.append("<i class='o_icon o_icon-fw o_ac_order_status_warning_icon'></i>"); break;
+				case CANCELED: sb.append("<i class='o_icon o_icon-fw o_ac_order_status_canceled_icon'></i>"); break;
+				default: sb.append("<i class='o_icon o_icon-fw o_ac_order_status_payed_icon'></i>");
 			}
 		}
 	}

src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol.html

@@ -10,11 +10,11 @@
 </p>
 <p>$r.translate("chelp.accesscontrol.access.member")</p>
 <p>$r.translate("chelp.accesscontrol.methods")</p>
-<div class="b_access_create">
+<div class="o_access_create">
 	<ul>
-		<li><b><i class="o_icon o_ac_free_icon o_icon-lg"></i>$r.translate("free.method")</b>: $r.translate("chelp.accesscontrol.method.free")</li>
- 		<li><b><i class="o_icon o_ac_token_icon o_icon-lg"></i>$r.translate("token.method")</b>: $r.translate("chelp.accesscontrol.method.token")</li>
- 		<li><b><i class="o_icon o_ac_paypal_icon o_icon-lg"></i>$r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "paypal.method")</b>: $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "chelp.accesscontrol_group.method.paypal")</li>
+		<li><b><i class="o_icon o_ac_free_icon o_icon-lg"></i> $r.translate("free.method")</b>: $r.translate("chelp.accesscontrol.method.free")</li>
+ 		<li><b><i class="o_icon o_ac_token_icon o_icon-lg"></i> $r.translate("token.method")</b>: $r.translate("chelp.accesscontrol.method.token")</li>
+ 		<li><b><i class="o_icon o_ac_paypal_icon o_icon-lg"></i> $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "paypal.method")</b>: $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "chelp.accesscontrol_group.method.paypal")</li>
 	</ul>	
 </div>
 <p>$r.translate("chelp.accesscontrol.dates")</p>

src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol_group.html

 <p>$r.translate("chelp.accesscontrol_group.intro")</p>
 <p>$r.translate("chelp.accesscontrol_group.access")</p>
 <p>$r.translate("chelp.accesscontrol_group.methods")</p>
-<div class="b_access_create">
+<div class="o_access_create">
 	<ul>
-		<li><b><i class="o_icon o_ac_free_icon o_icon-lg"></i>$r.translateWithPackage("org.olat.resource.accesscontrol.provider.free.ui","free.method")</b>: $r.translate("chelp.accesscontrol_group.method.free")</li>
- 		<li><b><i class="o_icon o_ac_token_icon o_icon-lg"></i>$r.translateWithPackage("org.olat.resource.accesscontrol.provider.token.ui","token.method")</b>: $r.translate("chelp.accesscontrol_group.method.token")</li>
- 		<li><b><i class="o_icon o_ac_paypal_icon o_icon-lg"></i>$r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "paypal.method")</b>: $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "chelp.accesscontrol_group.method.paypal")</li>
+		<li><b><i class="o_icon o_ac_free_icon o_icon-lg"></i> $r.translateWithPackage("org.olat.resource.accesscontrol.provider.free.ui","free.method")</b>: $r.translate("chelp.accesscontrol_group.method.free")</li>
+ 		<li><b><i class="o_icon o_ac_token_icon o_icon-lg"></i> $r.translateWithPackage("org.olat.resource.accesscontrol.provider.token.ui","token.method")</b>: $r.translate("chelp.accesscontrol_group.method.token")</li>
+ 		<li><b><i class="o_icon o_ac_paypal_icon o_icon-lg"></i> $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "paypal.method")</b>: $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "chelp.accesscontrol_group.method.paypal")</li>
 	</ul>	
 </div>
 <p>$r.translate("chelp.accesscontrol_group.dates")</p>

src/main/java/org/olat/resource/accesscontrol/ui/_content/access_method_list.html

-<div class="b_access_method_list">
+<div class="o_access_method_list">
 	<h3>
 		<i class="o_icon o_icon-fw o_icon_booking"></i> $r.translate("access.title")
 	</h3>
@@ -7,7 +7,6 @@
 	</p>
 	#foreach($link in $links)
 		<div class="clearfix">
-			<i class="o_icon o_icon-fw $link.getMethod().getMethodCssClass()"> </i>
 			$r.render("ac_$link.key")
 		</div>
 	#end

src/main/java/org/olat/resource/accesscontrol/ui/_content/access_refused.html

 <div id="o_main" class="row">
 	<div id="o_main_access_control">
 		<h3>
-			<i class="o_icon o_icon-fw o_icon_booking">$r.translate("access.title")
+			<i class="o_icon o_icon-fw o_icon_booking"> </i>$r.translate("access.title")
 		</h3>
 		<p class="o_info clearfix">
 			$r.translate("access.refused.desc")

src/main/java/org/olat/resource/accesscontrol/ui/_content/access_wrapper.html

-<div id="o_main" class="">
+<div id="o_main">
 	<div id="o_main_access_control">
 		#if($r.available("accessPanel"))
 			$r.render("accessPanel")

src/main/webapp/static/themes/light/modules/_icons.scss

@@ -263,6 +263,18 @@ $fa-css-prefix: "o_icon" !default;
 .o_ac_group_icon:before { content: $fa-var-group;}
 .o_ac_membersonly_icon:before { content: $fa-var-lock;}
 .o_ac_paypal_icon:before { content: $fa-var-credit-card;}
+.o_ac_status_canceled_icon:before { content: $fa-var-minus; color: $brand-warning;}
+.o_ac_status_error_icon:before { content: $fa-var-times; color: $brand-danger;}
+.o_ac_status_new_icon:before { content: $fa-var-asterisk; color: $brand-primary;}
+.o_ac_status_succes_icon:before { content: $fa-var-check; color: $brand-success;}
+.o_ac_status_waiting_icon:before { content: $fa-var-clock-o; color: $brand-primary;}
+.o_ac_order_status_new_icon:before { content: $fa-var-asterisk; color: $brand-primary;}
+.o_ac_order_status_prepayment_icon:before { content: $fa-var-money; color: $brand-info;}
+.o_ac_order_status_payed_icon:before { content: $fa-var-check; color: $brand-success;}
+.o_ac_order_status_canceled_icon:before { content: $fa-var-minus; color: $brand-warning;}
+.o_ac_order_status_error_icon:before { content: $fa-var-times; color: $brand-danger;}
+.o_ac_order_status_warning_icon:before { content: $fa-var-exclamation; color: $brand-warning;}
+
 
 /* File type icons */
 /* first the default that is used as base class. will be overriden by following classes */