Skip to content
Snippets Groups Projects
Commit a1740425 authored by gnaegi's avatar gnaegi
Browse files

OO-1068 inline messages refactoring

parent 972e228d
No related branches found
No related tags found
No related merge requests found
Showing
with 77 additions and 72 deletions
<div class="b_float_right">$r.contextHelp("de.bps.course.nodes.den",$chelp,"help.hover.den")</div>
<div class="b_float_left">
<div class="pull-right">$r.contextHelp("de.bps.course.nodes.den",$chelp,"help.hover.den")</div>
<table>
#if ($f.isVisible("subject"))
<tr valign="top">
......@@ -45,8 +44,6 @@
</tr>
#end
</table>
</div>
<div class="b_float_left">
<table>
#if ($f.isVisible("location"))
<tr valign="top">
......@@ -62,7 +59,6 @@
</tr>
#end
</table>
</div>
<div style="clear: both" class="b_center">
<div class="o_button_group">
$r.render("submitBtn")
</div>
<div class="b_warning">
<div class="o_warning">
$r.translate("error.config.noprovider")
</div>
\ No newline at end of file
......@@ -3,7 +3,7 @@
#if($exists)
<p>$r.translate("cmd.join.moderator.intro")</p>
$r.render("cmd.join.moderator")
<div class="b_info">
<div class="o_info">
<p><strong>$r.translate("title.options")</strong></p>
$r.render("cmd.remove.meeting")&nbsp;
$r.render("cmd.sync.meeting")
......
<!-- <OLATCE-103> -->
#if($exists)
#if($closed)
<p class="b_warning">$r.translate("meeting.status")</p>
<p class="o_warning">$r.translate("meeting.status")</p>
#end
#if($isModerator)
......@@ -12,7 +12,7 @@
$r.render("cmd.join.moderator")&nbsp;
</p>
$r.render("recordingsTable")
<div class="b_info">
<div class="o_info">
<p><strong>$r.translate("title.options")</strong></p>
#if($showGuestLink)
<p>$r.translate("description.guestlink")
......@@ -20,7 +20,7 @@
<br/>
#end
#if($closed)
##<p class="b_warning">$r.translate("meeting.status")</p>
##<p class="o_warning">$r.translate("meeting.status")</p>
$r.render("cmd.unclose.meeting")&nbsp;
#else
$r.render("cmd.close.meeting")&nbsp;
......@@ -51,7 +51,7 @@
<p>$r.translate("cmd.join.learner.wait")</p>
#end
#end
<div class="b_info">
<div class="o_info">
<p>$r.translate("cmd.open.wizard.intro")</p>
$r.render("cmd.open.wizard")
</div>
......
<h1>$r.translate("cce.informationpage.default.welcome", [$coursetitle])</h1>
<p>$r.translate("cce.informationpage.default.message", [$coursetitle])</p>
<p class="b_info">$r.translate("cce.informationpage.default.hint")</p>
\ No newline at end of file
<p class="o_info">$r.translate("cce.informationpage.default.hint")</p>
\ No newline at end of file
......@@ -4,21 +4,21 @@ $r.render("table")
#end
#if ($alreadyin != "")
<div class="b_info">
<div class="o_info">
<h5>$r.translate("import.title.finish.alreadyin")</h5>
$alreadyin
</div>
#end
#if ($notfound != "")
<div class="b_info">
<div class="o_info">
<h5>$r.translate("import.title.finish.notfound")</h5>
$notfound
</div>
#end
#if ($isanonymous != "")
<div class="b_info">
<div class="o_info">
<h5>$r.translate("import.title.finish.isanonymous")</h5>
$isanonymous
</div>
......
<p class="b_note">
<p class="o_note">
$r.translate("delete.users.direct.header")
</p>
$r.render("usersearch")
......
......@@ -197,12 +197,12 @@ class UserNewOldCustomFlexiCellRenderer extends AbstractCSSIconFlexiCellRenderer
protected String getCssClass(Object cellValue) {
if (cellValue instanceof Boolean) {
if (((Boolean) cellValue).booleanValue()) {
return "b_new_icon";
return "o_icon_new";
} else {
return "b_warn_icon";
return "o_icon_warn";
}
}
return "b_error_icon";
return "o_icon_error";
}
@Override
......
#if ($isGuest)
<div class="b_warning">${r.translate("filtered.first")}${r.render("cat.login")}${r.translate("filtered.second")}</div>
<div class="o_warning">${r.translate("filtered.first")}${r.render("cat.login")}${r.translate("filtered.second")}</div>
#end
$r.render("node")
\ No newline at end of file
<h3>$r.translate("contactform.title")</h3>
<p class="b_info">$r.translate("contactform.intro")</p>
<p class="o_info">$r.translate("contactform.intro")</p>
$r.render("contactForm")
......@@ -29,7 +29,7 @@
<p>
$r.translate("chelp.how8")
</p>
<p class="b_important">
<p class="o_important">
$r.translate("chelp.how8.win")
</p>
<p>
......
......@@ -24,7 +24,7 @@
<li><b>$r.translate("webdav.digest")</b><br />$r.translate("chelp.webdav.digest")</li>
</ul>
<p class="b_important">
<p class="o_important">
$r.translate("chelp.webdav.digest.disclaimer")
</p>
......
<div class="b_note">
<div class="o_note">
$r.translate("configuration.management.create.logout")
</div>
\ No newline at end of file
<div class="b_translation_edit b_form">
<div class="b_translation_edit_head">
<div class="o_translation_edit b_form">
<div class="o_translation_edit_head">
<table class="b_table b_table_nohover b_full">
<tr><td><span class="b_with_small_icon_left b_translation_package_icon"><b>$r.translate("generic.bundle"): </b></span></td><td id="bundlesSelectionContainer">$r.render("bundlesSelection")</td><td width="50%">$r.render("progressBarBundle")</td></tr>
<tr><td><span class="b_with_small_icon_left b_translation_item_icon"><b>$r.translate("generic.key"): </b></span></td><td>$r.render("keysSelection")</td><td>$r.render("progressBarKey")</td></tr>
<tr><td><span class="b_with_small_icon_left o_translation_package_icon"><b>$r.translate("generic.bundle"): </b></span></td><td id="bundlesSelectionContainer">$r.render("bundlesSelection")</td><td width="50%">$r.render("progressBarBundle")</td></tr>
<tr><td><span class="b_with_small_icon_left o_translation_item_icon"><b>$r.translate("generic.key"): </b></span></td><td>$r.render("keysSelection")</td><td>$r.render("progressBarKey")</td></tr>
</table>
</div>
<div class="b_translation_edit_body">
<p class="b_info">
<div class="o_translation_edit_body">
<p class="o_info">
$r.translate("edit.${customizingPrefix}intro")
</p>
<div class="b_translation_edit_reference b_form_element">
<div class="b_translation_refKey b_float_right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<div class="o_translation_edit_reference b_form_element">
<div class="o_translation_refKey b_float_right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<code></code> = <span></span>
</div>
<h5 class="b_with_small_icon_left b_flag_$referenceLanguageKey">$r.translate("generic.${customizingPrefix}lang.reference"): $referenceLanguage</h5>
<h5>
<i class="o_flag o_flag_$referenceLanguageKey"> </i>
$r.translate("generic.${customizingPrefix}lang.reference"): $referenceLanguage
</h5>
$r.render("referenceArea")
</div>
#if ($r.available("annotationAddLink"))
......@@ -24,31 +27,37 @@
</div>
#end
#else
<div class="b_translation_edit_annotation b_form_element" title="$r.translateInAttribute("edit.annotation.hover")" >
<h5 class="b_with_small_icon_left b_info_icon">$r.translate("generic.annotation")</h5>
<div class="o_translation_edit_annotation b_form_element" title="$r.translateInAttribute("edit.annotation.hover")" >
<h5>
<i class="o_icon o_icon_info"> </i>
$r.translate("generic.annotation")
</h5>
$r.render("annotationArea")
</div>
#end
<div class="b_translation_edit_compare b_form_element">
<div class="o_translation_edit_compare b_form_element">
#if ($compareSwitchEnabled)
<div class="b_translation_refKey b_float_right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<div class="o_translation_refKey pull-right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<code></code> = <span></span>
</div>
#end
<div class="b_clearfix">
<div class="b_float_left #if (!$compareSwitchEnabled) text-muted #end"><h5 class="b_with_small_icon_left b_flag_$compareLanguageKey">$r.translate("generic.lang.compare"): </h5></div>
<div class="b_float_left #if (!$compareSwitchEnabled) text-muted #end">$r.render("compareLangSelection") </div>
<div class="b_float_left" style="margin-right: 0;">$r.render("compareSwitch")</div>
<div class="pull-left #if (!$compareSwitchEnabled) text-muted #end"><h5><i class="o_flag o_flag_$compareLanguageKey">$r.translate("generic.lang.compare"): </h5></div>
<div class="pull-left #if (!$compareSwitchEnabled) text-muted #end">$r.render("compareLangSelection") </div>
<div class="pull-left" style="margin-right: 0;">$r.render("compareSwitch")</div>
$r.translate("generic.enable")
</div>
$r.render("compareArea")
</div>
<div class="b_translation_edit_target b_form_element" title="$r.translateInAttribute("edit.${customizingPrefix}target.hover")">
<div class="b_translation_refKey b_float_right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<div class="o_translation_edit_target b_form_element" title="$r.translateInAttribute("edit.${customizingPrefix}target.hover")">
<div class="o_translation_refKey b_float_right b_with_small_icon_left" style="display: none" onclick="this.style.display='none'">
<code></code> = <span></span>
</div>
<a href="#top" onclick="copyFromReference();" class="b_button b_xsmall b_float_right"><span>$r.translate('copy')</span></a>
<h5 class="b_with_small_icon_left b_flag_$targetLanguageKey">$r.translate("generic.${customizingPrefix}lang.target"): $targetLanguage</h5>
<a href="#top" onclick="copyFromReference();" class="btn btn-small pull-right"><span>$r.translate('copy')</span></a>
<h5>
<i class="o_flag o_flag_$targetLanguageKey"> </i>
$r.translate("generic.${customizingPrefix}lang.target"): $targetLanguage
</h5>
$r.render("targetArea")
</div>
<div class="b_button_group">
......@@ -68,7 +77,7 @@
/* <![CDATA[ */
//FIXME:FG:6.2: Implement Java way of setting flexi form link buttons dirty on change
function b_SetTranslationSaveLinksDirty() {
function o_SetTranslationSaveLinksDirty() {
var save=jQuery("#$f.getItemId("saveLink")");
if (!save.hasClass('o_button_dirty')) {
save.addClass('o_button_dirty');
......@@ -78,7 +87,7 @@ function b_SetTranslationSaveLinksDirty() {
}
}
jQuery("#$f.getItemId("targetArea")").on("keyup", b_SetTranslationSaveLinksDirty);
jQuery("#$f.getItemId("targetArea")").on("keyup", o_SetTranslationSaveLinksDirty);
## Code to check for user click on key references within the textarea fields
......@@ -120,9 +129,9 @@ function checkClick(wrapperName, langCode) {
var translated = trans.translate(key);
if (translated != reference) {
## set new key and value, make element visible
jQuery('div.' + wrapperName + ' div.b_translation_refKey code').html(reference);
jQuery('div.' + wrapperName + ' div.b_translation_refKey span').html(translated);
jQuery('div.' + wrapperName + ' div.b_translation_refKey').css('display: inline');
jQuery('div.' + wrapperName + ' div.o_translation_refKey code').html(reference);
jQuery('div.' + wrapperName + ' div.o_translation_refKey span').html(translated);
jQuery('div.' + wrapperName + ' div.o_translation_refKey').css('display: inline');
}
}
break;
......@@ -137,28 +146,28 @@ function checkClick(wrapperName, langCode) {
## Method to copy the text from the reference language to the target language
function copyFromReference() {
var refVal = jQuery('.b_translation_edit_reference textarea').val();
jQuery('.b_translation_edit_target textarea').val(refVal);
var refVal = jQuery('.o_translation_edit_reference textarea').val();
jQuery('.o_translation_edit_target textarea').val(refVal);
}
## Initialize observers
jQuery(function() {
jQuery('div.b_translation_edit_reference textarea').each(function(index, el) {
jQuery('div.o_translation_edit_reference textarea').each(function(index, el) {
jQuery(el).on('click', function() {
checkClick('b_translation_edit_reference','${referenceLanguageKey}');
checkClick('o_translation_edit_reference','${referenceLanguageKey}');
});
});
#if ($compareSwitchEnabled)
jQuery('div.b_translation_edit_compare textarea').each(function(index, el) {
jQuery('div.o_translation_edit_compare textarea').each(function(index, el) {
jQuery(el).on('click', function() {
checkClick('b_translation_edit_compare','${compareLanguageKey}');
checkClick('o_translation_edit_compare','${compareLanguageKey}');
});
});
#end
jQuery('div.b_translation_edit_target textarea').each(function(index, el) {
jQuery('div.o_translation_edit_target textarea').each(function(index, el) {
jQuery(el).on('click', function(){
checkClick('b_translation_edit_target','${targetLanguageKey}');
checkClick('o_translation_edit_target','${targetLanguageKey}');
});
jQuery(el).focus();
});
......
......@@ -3,11 +3,11 @@
<p>
$r.translate("list.found.entries", ["$keysCount","$bundlesCount"])
</p>
<p class="b_info">
<p class="o_info">
$r.translate("list.${customizingPrefix}intro")
</p>
#if ($i18nItems.size() > 0)
<div class="b_button_group">
<div class="o_button_group">
$r.render("allTranslateButtonTop")
</div>
#set($currentBundle="")
......@@ -19,8 +19,8 @@
<div class="b_translation_list_package">
#set ($currentBundle=$item.getBundleName())
<div class="b_clearfix">
<div class="b_float_right">
<div class="clearfix">
<div class="pull-right">
$r.render("translateBundle_$currentBundle")
</div>
<div class="o_tooglebox_wrapper">
......
......@@ -13,13 +13,13 @@
$r.translate("inline.intro")
</p>
#if ($logoutRequired)
<p class="b_warning">
<p class="o_warning">
$r.translate("inline.require.logout")
</p>
#end
#if ($r.available("inline.enable"))
<p>
<span class="b_with_small_icon_right b_status_disabled_icon">$r.translate("inline.state"): $r.translate("inline.state.disabled")</span>
<i class="b_with_small_icon_right b_status_disabled_icon">$r.translate("inline.state"): $r.translate("inline.state.disabled")</span>
</p>
$r.render("inline.enable")
#elseif ($r.available("inline.disable"))
......@@ -46,7 +46,7 @@
$r.translate("inline.customize.intro")
</p>
#if ($logoutRequired)
<p class="b_warning">
<p class="o_warning">
$r.translate("inline.customize.require.logout")
</p>
#end
......@@ -72,7 +72,7 @@
</p>
$r.render("cache.flush")
#else
<p class="b_warning">
<p class="o_warning">
$r.translate("cache.disabled")
</p>
#end
......
......@@ -36,7 +36,7 @@
</div>
<div class="b_translation_start_body">
<p class="b_info">
<p class="o_info">
$r.translate("start.${customizingPrefix}intro")
</p>
......
#if ($hasNoItems)
<p class="b_warning">
<p class="o_warning">
$r.translate("validation.error")
</p>
#else
......@@ -44,7 +44,7 @@
#if ($hasInvalidItems)
<fieldset>
<legend>$r.translate("validation.nok.title")</legend>
<p class="b_warning">
<p class="o_warning">
$r.translate("validation.nok.desc")
</p>
$r.render("notFoundList")
......
<h4>$r.translate("publish.header")</h4>
<div class="b_important">
<div class="o_important">
<h5>$r.translate("pbl.intro.warning.header")</h5>
$r.translate("pbl.intro.warning")
</div>
......
<h4>$r.translate("publish.access.header")</h4>
<div class='b_important'>
<div class='o_important'>
$r.translate("pbl.access.warning")
</div>
<div class='b_info'>
<div class='o_info'>
$r.translate("pbl.remind.catalog")
</div>
$r.render("accessBox")
\ 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