OO-1068: remove more b_ css class (search -> p not included)

src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_fr.properties

@@ -69,7 +69,7 @@ dates.table.participant.firstname=Pr\u00E9nom
 dates.table.participant.lastname=Nom
 dates.table.participant.manage=administrer
 dates.table.participant.name=Nom
-dates.table.participant.username=nom d'utilisateur
+dates.table.participant.username=Nom d'utilisateur
 dates.table.participants.num=Anz. participants
 dates.table.reserved=Places
 dates.table.run.enrolled=inscrit(e)

src/main/java/de/bps/olat/portal/institution/_content/institutionPortlet.html

@@ -4,13 +4,13 @@
   	  <a href="$iurl" target="_blank"><img src='$r.staticLink("images/institution/$ilogo")' alt="$iname" /></a>
 	  <p>$iname</p>
 	</h4>
-	<div class="b_toolbox"><ul>
+	<ul>
 	#if($hasPolymorphLink)
 	   #foreach($polyLink in $polyLinks)
 	       <li>$r.render("$polyLink")</li>
        #end
 	#end
-	</ul></div>
+	</ul>
 	<p class="clearfix">$r.translate("stextintro")<br />$sperson</p>
 	#if($showphone)
 		<p>$r.translate("phone"): $sphone</p>

src/main/java/de/bps/olat/portal/institution/_i18n/LocalStrings_fr.properties

@@ -4,11 +4,11 @@ catalogue=Catalogue
 course=Cours
 email=E-mail
 institution.description=L'universit\u00E9 \u00E0 travers laquelle vous \u00EAtes inscrit(e) dans OLAT
-institution.title=mon universit\u00E9
+institution.title=Mon universit\u00E9
 institutionPortlet.polymorphLink=\u00E7a commence ici\!
 noinstitution=L'universit\u00E9 n'a pas \u00E9t\u00E9 trouv\u00E9e dans le syst\u00E8me.
 phone=t\u00E9l\u00E9phone
 supervisor=Mon encadrement r\u00E9gional
-url=web
+url=Web
 warn.cantlaunch=Le lien n'est malheureusement pas valable. Veuillez informer votre encadrement r\u00E9gional.
 stextintro=

src/main/java/org/olat/admin/layout/_content/layoutadmin.html

@@ -3,7 +3,7 @@
 	<p>
 		$r.translate("layout.intro").
 	</p>
-	<div class="b_form">
+	<div class="o_form">
 		$r.render("themeAdminFormContainer")
 	</div>	
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/admin/securitygroup/gui/multi/_content/index.html

@@ -24,7 +24,7 @@ $r.render("table")
 </div>
 #end
 
-<div class="b_button_group">
+<div class="o_button_group">
 #if ($usercount > 0)
 	#if ($r.available("next"))
 		$r.render("next")

src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_fr.properties

@@ -27,9 +27,9 @@ step2.content=Les modifications suivantes seront effectu\u00E9es avec "Finir".
 step2.description=Contr\u00F4le/Aper\u00E7u
 step2.novalidChanges=Vous n'avez  effectu\u00E9 aucune modification, l'assistant ne peut pas \u00EAtre termin\u00E9 ainsi.
 table.role.admin=Administration de syst\u00E8me
-table.role.author=auteur
+table.role.author=Auteur
 table.role.groupadmin=Administrateur des groupes
-table.role.status=statut
+table.role.status=Statut
 table.role.useradmin=Administrateur des utilisateurs
-table.user.login=nom d'utilisateur
+table.user.login=Nom d'utilisateur
 title=Modifications des attributs d'utilisateurs

src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_fr.properties

@@ -9,7 +9,7 @@ close=Fermer
 delete.announcement.email.body=Vous ne vous \u00EAtes plus connect\u00E9 sur OLAT depuis $lastloginduration mois et votre compte sera donc supprim\u00E9 dans $durationdeleteemail jours. Pour \u00E9viter ceci, veuillez vous connecter \u00E0 OLAT.\r\n\r\nCeci concerne $firstname $lastname (nom d'utilisateur OLAT\: $username)
 delete.announcement.email.subject=Attention\: votre compte d'utilisateur OLAT sera supprim\u00E9
 delete.email.announcement.warning.header=Pour les utilisateurs suivants, l'e-mail concernant la suppression de compte n'a pas pu \u00EAtre envoy\u00E9\: <br>
-delete.list=nom d'utilisateur
+delete.list=Nom d'utilisateur
 delete.list.example=Un nom d'utilisateur(Login) par ligne\:<br>login1@tu-chemnitz.de<br>login2@tu-dresden.de<br />usw.<br /><br />V\u00E9rifier d'indiquer correctement le domaine de l'universit\u00E9\!
 delete.reason=Raison de la proc\u00E9dure d'effacement
 delete.searchuser=Recherche utilisateur \u00E0 supprimer
@@ -43,7 +43,7 @@ readyToDelete.delete.confirm=Les comptes d'utilisateur s\u00E9lectionn\u00E9s {0
 reason.empty=N'indiquez aucune raison\!
 selection.feedback.msg=Un e-mail avec avertissement de suppression a \u00E9t\u00E9 envoy\u00E9 aux utilisateurs.
 status.delete.email.header=Les utilisateurs ci-dessus ont \u00E9t\u00E9 inform\u00E9s par e-mail sur la suppression prochaine de leur compte. Le d\u00E9lai de {0} jours pour une r\u00E9action (r\u00E9ponse ou connexion) n'est pas encore \u00E9coul\u00E9.
-table.col.login=nom d'utilisateur
+table.col.login=Nom d'utilisateur
 table.identity.deleteEmail=E-mail de suppression
 table.users.found=utilisateurs trouv\u00E9s
 table.users.notfound=Les utilisateurs suivants n'ont pas pu \u00EAtre trouv\u00E9

src/main/java/org/olat/commons/calendar/_content/importedCalConfig.html

@@ -7,7 +7,7 @@
 	  <legend>$r.translate("cal.import.list")</legend>
 
 #if (!$insideManager)
-    <div class="b_float_right">
+    <div class="o_button_group o_button_group_right">
        $r.render("cal.managecalendars")
     </div>
 #end
@@ -62,8 +62,5 @@
 #if ($calendars.size() > 5)
 	</div>
 #end
-
-  
-  </fieldset>
-  </div>
-
+</fieldset>
+</div>

src/main/java/org/olat/commons/calendar/_content/indexWeekly.html

-<div id="o_cal_config_below_cal_container">
-  <div class="o_cal_toptoolbar clearfix">
-			
-			<div class="o_cal_pagination">
-				$r.render("cal.thisweek")
-				$r.render("cal.prevweek")
-				$r.render("cal.nextweek")
-			</div>
-			
-			<div class="o_cal_gotodate">
-				$r.render("cal.gotodate")
-			</div>
-			
-			<div class="o_cal_search">
-		    	$r.render("cal.search.button")
-			</div>
-	
-	#if ($caller == "home")
-		$r.contextHelpWithWrapper("org.olat.commons.calendar","personal-calendar.html","help.hover.personalcal")
-	#elseif ($caller == "course")
-		$r.contextHelpWithWrapper("org.olat.commons.calendar","course-calendar.html","help.hover.coursecal")
-	#elseif ($caller == "collab")
-		$r.contextHelpWithWrapper("org.olat.commons.calendar","group-calendar.html","help.hover.groupcal")
-	#elseif ($caller == "profile")
-		$r.contextHelpWithWrapper("org.olat.commons.calendar","personal-calendar.html","help.hover.cal")
-	#end
-  </div>
-	<div class="clearfix" style="position:relative;">
-	  <div class="o_cal_search_subscribe" style="float:left;">
-			<span class="o_noti_actions">
-				#if ($hasSubscription)
-					#if ($isSubscribed)
-						<span class="o_noti_u_icon">$r.render("cal.unsubscribe")</span>
-					#else
-						<span class="o_noti_s_icon">$r.render("cal.subscribe")</span>
-					#end
-				#end
-			</span>
-	  </div>
-	  <div class="b_subcr" style="float:right;">
-			#if ($r.available("calsubscription"))
-				$r.render("calsubscription")
-			#end
-	  </div>
-	</div>
-  <div class="o_cal_week_year_label"> $r.translate("cal.week.label") $week - $year </div>
-  $r.render("calendar")
-  $r.render("calendarConfig")
-  #if ($caller == "home")
-  	$r.render("importedCalendarConfig")
-  #end
-</div>
-
-</div>
\ No newline at end of file

src/main/java/org/olat/commons/calendar/_content/manageCalendars.html

-
 #if ($importedCalendarWrappers.size() > 0)
-	<div class="b_subcolumns">
-	  <div class="b_c50l">
-      <div class="b_subcl">
+	<div class="clearfix">
         $r.render("importedCalendarConfig")
-      </div>
-    </div>
-	  <div class="b_c50r">
-	    <div class="b_subcr">
+    </div>  
+	<div class="clearfix">
         #if ($choose == 0)
           $r.render("fileupload")
         #else 
-          <div>
-            Import Calendar<br/><br/>
-            $r.render("cal.import.type.file")&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            $r.render("cal.import.type.url")<br/><br/><br/>
-          </div>
+            Import Calendar
+            <div class="o_button_group">
+				$r.render("cal.import.type.file")
+				$r.render("cal.import.type.url")
+            </div>
         #end
-		  </div>
 	  </div>
   </div>
 #else
-  #if ($choose == 0)
-    $r.render("fileupload")
-  #else 
-    <div>
-      $r.translate("cal.import.title")<br/><br/>
-      $r.render("cal.import.type.file")&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      $r.render("cal.import.type.url")<br/><br/><br/>
-    </div>
-  #end
-#end
-
+	#if ($choose == 0)
+		$r.render("fileupload")
+	#else 
+		<div>
+			$r.translate("cal.import.title")
+			<div class="o_button_group">
+				$r.render("cal.import.type.file")
+				$r.render("cal.import.type.url")
+			</div>
+		</div>
+	#end
+#end
\ No newline at end of file

src/main/java/org/olat/commons/calendar/ui/MediaLinksController.java

@@ -140,7 +140,7 @@ public class MediaLinksController extends FormBasicController {
 		
 		// custom media action button
 		FormLink mediaButton = uifactory.addFormLink("media_" + id, " ", " ", layoutContainer, Link.NONTRANSLATED);
-		mediaButton.setCustomEnabledLinkCSS("b_small o_ll_browse");
+		mediaButton.setIconLeftCSS("o_icon o_icon_browse");
 		mediaButton.setUserObject(link);
 		link.setMediaButton(mediaButton);
 		

src/main/java/org/olat/core/commons/controllers/linkchooser/_content/internallinkchooser.html

 <div id="o_internallink_chooser">
-	<h3>
-		$r.translate("filechooser.select.internallink.title")
-	</h3>
-	<p>
+	<h3>$r.translate("filechooser.select.internallink.title")</h3>
 	$r.render("internalLinkTree")
 	
 	#if ($r.available("selectfile"))
-		<div class="b_button_group">
+		<div class="o_button_group">
 			$r.render("selectfile")
 			$r.render("cancel")
 		</div>	
 	#end
-	
 </div>
\ No newline at end of file

src/main/java/org/olat/core/commons/editor/plaintexteditor/_content/index.html

-<div class="b_plaintext_editor">
+<div class="o_plaintext_editor">
 	$r.render("form")
 	#if ($findtext)
 	<script type="text/javascript">

src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoController.java

@@ -201,7 +201,6 @@ public class MetaInfoController extends FormBasicController {
 
 		if (!hasMetadata(meta)) {
 			moreMetaDataLink = uifactory.addFormLink("mf.more.meta.link", formLayout, Link.LINK_CUSTOM_CSS);
-			moreMetaDataLink.setCustomEnabledLinkCSS("b_link_moreinfo");
 			setMetaFieldsVisible(false);
 		}
 

src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFormController.java

@@ -272,7 +272,6 @@ public class MetaInfoFormController extends FormBasicController {
 
 		if (!hasMetadata(meta)) {
 			moreMetaDataLink = uifactory.addFormLink("mf.more.meta.link", formLayout, Link.LINK_CUSTOM_CSS);
-			moreMetaDataLink.setCustomEnabledLinkCSS("b_link_moreinfo");
 			setMetaFieldsVisible(false);
 		}
 

src/main/java/org/olat/core/commons/portlets/iframe/IframePortletRunController.java

@@ -66,40 +66,40 @@ public class IframePortletRunController extends BasicController {
 	private VFSContainer rootDir;
 	private CloseableModalController cmc;
 
-	protected IframePortletRunController(UserRequest ureq, WindowControl wControl, Map configuration) {
+	protected IframePortletRunController(UserRequest ureq, WindowControl wControl, Map<String,String> configuration) {
 		super(ureq, wControl);
 				
-		this.iframeVC = this.createVelocityContainer("iframePortlet");
+		iframeVC = createVelocityContainer("iframePortlet");
 	
 		// uri is mandatory
-		String uri = (String)configuration.get("uri");
+		String uri = configuration.get("uri");
 		/*
 		 * temp fix for wrong config
 		 */
-		if(uri != null && uri.startsWith("$")){
+		if(uri != null && uri.startsWith("$")) {
 			uri = null;
 			iframeVC.contextPut("ENABLED", Boolean.FALSE);
-		}else{
+		} else {
 			iframeVC.contextPut("ENABLED", Boolean.TRUE);
 		}
 		if (uri == null) log.warn("Missing argument 'uri' in iframeportlet configuration"); 
-		this.iframeVC.contextPut("uri", uri);
+		iframeVC.contextPut("uri", uri);
 	
 		// height of iframe is mandatory
-		String height = (String)configuration.get("height");
+		String height = configuration.get("height");
 		if (height == null) log.warn("Missing argument 'height' in iframeportlet configuration"); 
-		this.iframeVC.contextPut("height", height);
+		iframeVC.contextPut("height", height);
 
 		// target attribute of iframe, should be unique on page
-		String id = (String)configuration.get("id");
-		this.iframeVC.contextPut("name", id);
+		String id = configuration.get("id");
+		iframeVC.contextPut("name", id);
 
 		// edit Link only for administrators
 		if (ureq.getUserSession().getRoles().isOLATAdmin()) {
-			String editFilePath = (String)configuration.get("editFilePath");
+			String editFilePath = configuration.get("editFilePath");
 			boolean editLinkEnabled = false;
 			if (StringHelper.containsNonWhitespace(editFilePath)) {
-				editLinkEnabled = initEditButton(ureq, editFilePath);
+				editLinkEnabled = initEditButton(editFilePath);
 			} else {
 				// ignore missing argument
 				// editLinkEnabled false in this case
@@ -119,7 +119,7 @@ public class IframePortletRunController extends BasicController {
 	 * @param ureq
 	 * @param editFilePath
 	 */
-	public boolean initEditButton(UserRequest ureq, String editFilePath) {
+	private boolean initEditButton(String editFilePath) {
 		if(editFilePath == null){
 			log.warn("initEditButton: editFilePath was null");
 			return false;
@@ -164,6 +164,7 @@ public class IframePortletRunController extends BasicController {
 	/**
 	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
 	 */
+	@Override
 	public void event(UserRequest ureq, Component source, Event event) {
 		if (source == editLink) {
 			// start up editor controller as modal dialog
@@ -177,7 +178,7 @@ public class IframePortletRunController extends BasicController {
 		}
 	}
 
-	
+	@Override
 	public void event(UserRequest ureq, Controller source, Event event) {
 		if (source == editorCtr) {
 			if (event == Event.CANCELLED_EVENT || event == Event.DONE_EVENT) {
@@ -192,8 +193,8 @@ public class IframePortletRunController extends BasicController {
 	/**
 	 * @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
 	 */
+	@Override
 	protected void doDispose() {
     // editorCtr is registerd with listenTo and gets disposed in BasicController		
 	}
-
 }

src/main/java/org/olat/core/commons/portlets/iframe/_content/iframePortlet.html

 #if ($r.available("edit"))
-	<div class="b_float_right">
+	<div class="o_button_group o_button_group_right">
 	$r.render("edit")
 	</div>
 #end

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

@@ -42,13 +42,8 @@ import org.olat.core.logging.OLATRuntimeException;
  * @author patrickb
  */
 public class FormJSHelper {
-	private static final String READONLYA = "<div class=\"b_form_disabled\">";
 
-	private static final String READONLYB = "</div>";
-
-	// EXTJS DEP
-	private static final String[] EXTJSACTIONS = { "dblclick", "click",
-			"change" };
+	private static final String[] EXTJSACTIONS = { "dblclick", "click", "change" };
 
 	/**
 	 * create for example an
@@ -119,12 +114,6 @@ public class FormJSHelper {
 		return sb.toString();
 	}
 
-	public static void appendReadOnly(String text, StringOutput sb) {
-		sb.append(READONLYA);
-		sb.append(text);
-		sb.append(READONLYB);
-	}
-
 	/**
 	 * 
 	 * @param sb

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

@@ -551,7 +551,7 @@ public class FormLayoutContainer extends FormItemImpl implements FormItemContain
 
 	/**
 	 * Create a layout container that should be only used to render buttons using
-	 * a b_button_group css wrapper. Buttons are ususally rendered on one line
+	 * a o_button_group css wrapper. Buttons are ususally rendered on one line
 	 * without indent
 	 * 
 	 * @param name

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

@@ -181,7 +181,7 @@ class JSDateChooserRenderer extends DefaultComponentRenderer {
 				shorter += " ";
 			}
 		}				
-		sb.append("<input disabled=\"disabled\" class=\"b_form_element_disabled\" size=\"")
+		sb.append("<input disabled=\"disabled\" class=\"o_form_element_disabled\" size=\"")
 		  .append(te.displaySize)
 		  .append("\" value=\"").append(shorter).append("\" /></span>");
 	}