Skip to content
Snippets Groups Projects
Commit 7955bbfe authored by srosse's avatar srosse
Browse files

OO-1068: remove more b_ css class (search -> f not inclusive)

parent 555d5e27
No related branches found
No related tags found
No related merge requests found
Showing
with 62 additions and 93 deletions
<br/>
$r.translateWithPackage("org.olat","chelp.moreInfo") <br/>
<br/>
$r.translateWithPackage("org.olat","chelp.moreInfo") <br/>
$r.contextHelpRelativeLink("ced-visacc-expl.html")<br/>
$r.contextHelpRelativeLink("ced-expert-expl.html")<br/>
$r.contextHelpRelativeLink("ced-expert-eg.html")<br/>
$r.contextHelpRelativeLink("ced-attr.html")<br/>
<a class="b_link_extern" href="http://www.switch.ch/aai/" target="_blank">$r.translate("chelp.generalAAI")</a><br/><br/>
<a href="http://www.switch.ch/aai/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> $r.translate("chelp.generalAAI")</a><br/><br/>
$r.translate("chelp.8vis")<br/><br/>
$r.translate("chelp.coachExclusive") $r.translate("chelp.9") $r.translate("chelp.10vis") <br/><br/>
$r.translate("chelp.dateSwitch") $r.translate("chelp.11vis")<br/><br/>
$r.translate("chelp.groupSwitch") $r.translate("chelp.12vis")<br/><br/>
$r.translate("chelp.assessmentSwitch") $r.translate("chelp.13") $r.translate("chelp.13vis")<br/>
$r.translate("chelp.14vis")<br/><br/>
$r.translate("chelp.attributeEasy") $r.translate("chelp.16vis")$r.contextHelpRelativeLink("ced-attr.html") $r.translate("chelp.and") <a class="b_link_extern" href="http://www.switch.ch/aai/" target="_blank">$r.translate("chelp.generalAAI")</a><br/><br/>
$r.translate("chelp.applyRulesForCoach") $r.translate("chelp.15vis")<br/><br/>
$r.translate("chelp.16")
$r.translate("chelp.coachExclusive") $r.translate("chelp.9") $r.translate("chelp.10vis") <br/><br/>
$r.translate("chelp.dateSwitch") $r.translate("chelp.11vis")<br/><br/>
$r.translate("chelp.groupSwitch") $r.translate("chelp.12vis")<br/><br/>
$r.translate("chelp.assessmentSwitch") $r.translate("chelp.13") $r.translate("chelp.13vis")<br/>
$r.translate("chelp.14vis")<br/><br/>
$r.translate("chelp.attributeEasy") $r.translate("chelp.16vis")$r.contextHelpRelativeLink("ced-attr.html") $r.translate("chelp.and") <a href="http://www.switch.ch/aai/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> $r.translate("chelp.generalAAI")</a><br/><br/>
$r.translate("chelp.applyRulesForCoach") $r.translate("chelp.15vis")<br/><br/>
$r.translate("chelp.16")
<br/>
$r.translate("chelp.accWikiRw1") $r.translate("chelp.accWikiRw2") <br/><br/>
<br/>
$r.translate("chelp.accWikiRw1") $r.translate("chelp.accWikiRw2") <br/><br/>
$r.translateWithPackage("org.olat","chelp.moreInfo") <br/>
$r.contextHelpRelativeLink("ced-visacc-expl.html")<br/>
$r.contextHelpRelativeLink("ced-expert-expl.html")<br/>
$r.contextHelpRelativeLink("ced-expert-eg.html")<br/>
$r.contextHelpRelativeLink("ced-attr.html")<br/>
<a class="b_link_extern" href="http://www.switch.ch/aai/" target="_blank">$r.translate("chelp.generalAAI")</a>
<a href="http://www.switch.ch/aai/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> $r.translate("chelp.generalAAI")</a>
<br/><br/>
#* redundant part!: look after this part
in other files on change
*#
$r.translate("chelp.coachExclusive")
$r.translate("chelp.9")
$r.translate("chelp.10acc")<br/><br/>
$r.translate("chelp.dateSwitch") $r.translate("chelp.11acc")<br/><br/>
$r.translate("chelp.groupSwitch") $r.translate("chelp.12acc")<br/><br/>
$r.translate("chelp.assessmentSwitch") $r.translate("chelp.13") $r.translate("chelp.13acc")<br/>
$r.translate("chelp.14acc")<br/><br/>
$r.translate("chelp.applyRulesForCoach") $r.translate("chelp.15acc")<br/><br/>
$r.translate("chelp.16")
$r.translate("chelp.coachExclusive")
$r.translate("chelp.9")
$r.translate("chelp.10acc")<br/><br/>
$r.translate("chelp.dateSwitch") $r.translate("chelp.11acc")<br/><br/>
$r.translate("chelp.groupSwitch") $r.translate("chelp.12acc")<br/><br/>
$r.translate("chelp.assessmentSwitch") $r.translate("chelp.13") $r.translate("chelp.13acc")<br/>
$r.translate("chelp.14acc")<br/><br/>
$r.translate("chelp.applyRulesForCoach") $r.translate("chelp.15acc")<br/><br/>
$r.translate("chelp.16")
\ No newline at end of file
......@@ -11,9 +11,5 @@
<input type="checkbox" disabled="disabled" />$r.render("uncheckall")
</div>
<div class="b_form_element_wrapper">
<div class="b_form_element">
$r.render("ok-cancel")
</div>
</div>
<div class=o_button_group>$r.render("ok-cancel")</div>
</div>
\ No newline at end of file
......@@ -4,14 +4,14 @@
#if($r.available("repoRights"))
<fieldset>
<legend>$editTitle</legend>
<div class="b_form_desc">$r.translate("edit.member.repo.desc")</div>
<div class="o_desc">$r.translate("edit.member.repo.desc")</div>
$r.render("repoRights")
</fieldset>
#end
#if($r.available("groupList"))
<fieldset>
<legend>$r.translate("edit.member.groups")</legend>
<div class="b_form_desc">$r.translate("edit.member.groups.desc")</div>
<div class="o_desc">$r.translate("edit.member.groups.desc")</div>
$r.render("groupList")
</fieldset>
#end
......
......@@ -95,8 +95,9 @@ public class LTIEditController extends ActivateableTabbableDefaultController imp
this.editCourseEnv = course.getCourseEnvironment();
this.stackPanel = stackPanel;
myContent = this.createVelocityContainer("edit");
myContent = createVelocityContainer("edit");
previewButton = LinkFactory.createButtonSmall("command.preview", myContent, this);
previewButton.setIconLeftCSS("o_icon o_icon_preview");
ltConfigForm = new LTIConfigForm(ureq, wControl, config);
listenTo(ltConfigForm);
......
......@@ -3,7 +3,7 @@
</p>
<p>
$r.translate("chelp.lti.info")
<a href="http://www.imsglobal.org/lti/" target="_blank" class="b_link_extern">http://www.imsglobal.org/lti/</a>
<a href="http://www.imsglobal.org/lti/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://www.imsglobal.org/lti/</a>
</p>
<hr />
......
<div class="b_lti_edit_wrapper">
#if ($showPreviewButton)
<div class="o_buttons_box_right">$r.render("command.preview")</div>
<div class="o_button_group o_button_group_right">$r.render("command.preview")</div>
#end
$r.render("ltConfigForm")
</div>
$r.render("ltConfigForm")
\ No newline at end of file
......@@ -231,7 +231,7 @@ public class COConfigForm extends FormBasicController {
// FIXING LINK ONLY IF A DEFAULTCONTEXT EXISTS
fixGroupError = new FormLinkImpl("error.fix", "create");
// link
fixGroupError.setCustomEnabledLinkCSS("b_button");
fixGroupError.setCustomEnabledLinkCSS("btn btn-default");
errorGroupItemLayout.add(fixGroupError);
fixGroupError.setErrorKey(labelKey, params);
......@@ -286,7 +286,7 @@ public class COConfigForm extends FormBasicController {
// FXINGIN LINK ONLY IF DEFAULT CONTEXT EXISTS
fixAreaError = new FormLinkImpl("error.fix", "create");// erstellen
// link
fixAreaError.setCustomEnabledLinkCSS("b_button");
fixAreaError.setCustomEnabledLinkCSS("btn btn-default");
errorAreaItemLayout.add(fixAreaError);
fixAreaError.setErrorKey(labelKey, params);
......@@ -442,8 +442,8 @@ public class COConfigForm extends FormBasicController {
easyGroupList = uifactory.addStaticTextElement("group", "form.message.group", groupInitVal, formLayout);
easyGroupList.setUserObject(groupKeys);
chooseGroupsLink = uifactory.addFormLink("choose", formLayout, "b_form_groupchooser");
createGroupsLink = uifactory.addFormLink("create", formLayout, "b_form_groupchooser");
chooseGroupsLink = uifactory.addFormLink("choose", formLayout, "o_form_groupchooser");
createGroupsLink = uifactory.addFormLink("create", formLayout, "o_form_groupchooser");
hasGroups = businessGroupService.countBusinessGroups(null, cev.getCourseGroupManager().getCourseEntry()) > 0;
......@@ -463,8 +463,8 @@ public class COConfigForm extends FormBasicController {
easyAreaList = uifactory.addStaticTextElement("area", "form.message.area", areaInitVal, formLayout);
easyAreaList.setUserObject(areaKeys);
chooseAreasLink = uifactory.addFormLink("choose", formLayout, "b_form_groupchooser");
createAreasLink = uifactory.addFormLink("create", formLayout, "b_form_groupchooser");
chooseAreasLink = uifactory.addFormLink("choose", formLayout, "o_form_groupchooser");
createAreasLink = uifactory.addFormLink("create", formLayout, "o_form_groupchooser");
hasAreas = areaManager.countBGAreasInContext(cev.getCourseGroupManager().getCourseResource()) > 0;
......
......@@ -242,7 +242,7 @@ public class CPEditController extends ActivateableTabbableDefaultController impl
setCPReference(re, config);
cpConfigurationVc.contextPut("showPreviewButton", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, cpConfigurationVc, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
// remove existing edit link, add new one if user is allowed to edit this CP
if (editLink != null) {
......
......@@ -279,7 +279,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
// FIXING LINK ONLY IF A DEFAULTCONTEXT EXISTS
fixGroupError = new FormLinkImpl("error.fix", "create");
// link
fixGroupError.setCustomEnabledLinkCSS("b_button");
fixGroupError.setCustomEnabledLinkCSS("btn btn-default");
errorGroupItemLayout.add(fixGroupError);
fixGroupError.setErrorKey(labelKey, params);
......@@ -332,7 +332,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
// FXINGIN LINK ONLY IF DEFAULT CONTEXT EXISTS
fixAreaError = new FormLinkImpl("error.fix", "create");// erstellen
// link
fixAreaError.setCustomEnabledLinkCSS("b_button");
fixAreaError.setCustomEnabledLinkCSS("btn btn-default");
errorAreaItemLayout.add(fixAreaError);
fixAreaError.setErrorKey(labelKey, params);
......
......@@ -166,7 +166,7 @@ public abstract class FeedNodeEditController extends ActivateableTabbableDefault
contentVC.contextPut(SHOW_PREVIEW_LINK, Boolean.TRUE);
previewLink = LinkFactory.createCustomLink(COMMAND_PREVIEW, COMMAND_PREVIEW, re.getDisplayname(), Link.NONTRANSLATED, contentVC,
this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate(COMMAND_PREVIEW));
}
......@@ -282,7 +282,7 @@ public abstract class FeedNodeEditController extends ActivateableTabbableDefault
contentVC.contextPut("showPreviewLink", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED,
contentVC, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
// no securitycheck on feeds, editable by everybody
editLink = LinkFactory.createButtonSmall("edit", contentVC, this);
......
......@@ -363,7 +363,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
}
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, myContent, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
}
......@@ -738,7 +738,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
setIQReference(re, moduleConfiguration);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, myContent, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
myContent.contextPut("dontRenderRepositoryButton", new Boolean(true));
// If of type test, get min, max, cut - put in module config and push
......
......@@ -118,7 +118,7 @@ public class PortfolioConfigForm extends FormBasicController {
mapNameElement.setVisible(map == null);
previewMapLink = uifactory.addFormLink("preview", "selected.map", "selected.map", formLayout, Link.LINK);
previewMapLink.setCustomEnabledLinkCSS("b_preview");
previewMapLink.setCustomEnabledLinkCSS("o_preview");
((Link)previewMapLink.getComponent()).setCustomDisplayText(name);
previewMapLink.setVisible(map != null);
previewMapLink.setElementCssClass("o_sel_preview_map");
......
<div class="b_eportfolio_share_policy">
<div class="o_eportfolio_share_policy">
$r.render("deadline-month")
<div><span>$r.translate("deadline.month")</span></div>
$r.render("deadline-week")
......
......@@ -169,7 +169,7 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
} else {
cpConfigurationVc.contextPut("showPreviewButton", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, cpConfigurationVc, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
ScormPackageConfig scormConfig = ScormMainManager.getInstance().getScormPackageConfig(re.getOlatResource());
......@@ -278,7 +278,7 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
setScormCPReference(re, config);
cpConfigurationVc.contextPut("showPreviewButton", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, cpConfigurationVc, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
// fire event so the updated config is saved by the
// editormaincontroller
......
$r.translate("chelp.sco1") <br/><br/>
$r.translate("chelp.moreInfo") <br/>
$r.contextHelpRelativeLink("org.olat.course.editor","ced-expert-expl.html")<br/>
$r.contextHelpRelativeLink("org.olat.course.editor","ced-expert-eg.html")<br/>
<a class="b_link_extern" href="http://www.switch.ch/aai/" target="_blank">$r.translateWithPackage("org.olat.course.editor","chelp.generalAAI")</a> <br/>
<a href="http://www.switch.ch/aai/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> $r.translateWithPackage("org.olat.course.editor","chelp.generalAAI")</a> <br/>
$r.contextHelpRelativeLink("org.olat.course.editor","ced-attr.html") <br/>
<a class="b_link_extern" href="http://www.switch.ch/aai/docs/AAI_Attr_Specs.pdf" target="_blank">$r.translateWithPackage("org.olat.course.editor","chelp.link3Text")</a> <br/><br/>
$r.translate("chelp.hasScore")
$r.translate("chelp.sco2") <br/><br/>
$r.translate("chelp.passType")
$r.translate("chelp.sco3") <br/>
$r.translate("chelp.sco4") <br/><br/>
$r.translateWithPackage("org.olat.course.editor","chelp.16")
<a href="http://www.switch.ch/aai/docs/AAI_Attr_Specs.pdf" target="_blank"><i class="o_icon o_icon_link_extern"> </i> $r.translateWithPackage("org.olat.course.editor","chelp.link3Text")</a> <br/><br/>
$r.translate("chelp.hasScore")
$r.translate("chelp.sco2") <br/><br/>
$r.translate("chelp.passType")
$r.translate("chelp.sco3") <br/>
$r.translate("chelp.sco4") <br/><br/>
$r.translateWithPackage("org.olat.course.editor","chelp.16")
\ No newline at end of file
......@@ -151,7 +151,7 @@ public class WikiEditController extends ActivateableTabbableDefaultController im
editLink = LinkFactory.createButtonSmall("edit", content, this);
content.contextPut("showPreviewLink", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, content, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
}
} else {
......@@ -221,7 +221,7 @@ public class WikiEditController extends ActivateableTabbableDefaultController im
setWikiRepoReference(re, moduleConfiguration);
content.contextPut("showPreviewLink", Boolean.TRUE);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, content, this);
previewLink.setCustomEnabledLinkCSS("b_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
// no securitycheck on wiki, editable by everybody
editLink = LinkFactory.createButtonSmall("edit", content, this);
......
$r.translate("chelp.wiked1")
$r.translate("chelp.wiked10")
<br/>
<a class="b_link_extern" href="http://jamwiki.org/wiki/en/Wiki_Syntax" target="_blank">http://jamwiki.org/wiki/en/Wiki_Syntax</a>
<a href="http://jamwiki.org/wiki/en/Wiki_Syntax" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://jamwiki.org/wiki/en/Wiki_Syntax</a>
<br/><br/>
$r.translate("chelp.caution") <br/>
$r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/>
<table class="b_table b_grid">
<table class="table table-bordered">
<thead>
<tr>
<th width="50%">$r.translateWithPackage("org.olat.course.editor","chelp.synt")</th>
......@@ -217,7 +217,7 @@ $r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/>
<br />
$r.translate("chelp.wiked122")
<br />
<a class="b_link_extern" href="http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html" target="_blank">http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html</a>
<a href="http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html</a>
</td>
</tr>
......@@ -226,7 +226,7 @@ $r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/>
<td>
$r.translate("chelp.wiked12")
<br />
<a class="b_link_extern" href="http://meta.wikimedia.org/wiki/Help:Formula" target="_blank">http://meta.wikimedia.org/wiki/Help:Formula</a>
<a href="http://meta.wikimedia.org/wiki/Help:Formula" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://meta.wikimedia.org/wiki/Help:Formula</a>
</td>
</tr>
......@@ -244,12 +244,5 @@ $r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/>
<td colspan="2"><br/>
<b>$r.translate("chelp.subtit6") </b></td>
</tr>
<tr>
<td>----</td>
<td>&nbsp;
<hr class="b_wiki_hr" />
</td>
</tr>
</tbody>
</table>
\ No newline at end of file
......@@ -1311,16 +1311,6 @@ public class RunMainController extends MainLayoutBasicController implements Gene
)
);
}
/*private void addCurrentUserCount(ToolController myTool) {
VelocityContainer currentUsers = createVelocityContainer("currentUsers");
currentUserCountLink = LinkFactory.createCustomLink("currentUsers", "cUsers", "", Link.NONTRANSLATED, currentUsers, this);
updateCurrentUserCount();
currentUserCountLink.setCustomEnabledLinkCSS("b_toolbox_link");
currentUserCountLink.setTooltip(getTranslator().translate("participants.in.course.desc"));
currentUserCountLink.setEnabled(false);
myTool.addComponent(currentUserCountLink);
}*/
/**
* Reads the users learning group rights from a local hash map. use
......
<div class="b_float_left ">
$r.render("currentUsers")
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment