' +
@@ -93,12 +94,31 @@
return false;
};
- $.facebox.setHeader = function(obj) {
- if ($("#facebox .titleHeader")) {
- $("#facebox .titleHeader").remove();
+ $.facebox.setHeader = function(page_type) {
+ var pageTitle = "";
+ if(page_type === evalTemplateUtils.pages.preview_item_page){
+ pageTitle = evalTemplateUtils.messageLocator("previewitem.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_block_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifyblock-page-title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_item_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifyitem.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_template_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifytemplatetitledesc.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.choose_expert_page){
+ pageTitle = evalTemplateUtils.messageLocator("expert.expert.items");
}
- $(obj).clone(true).insertBefore($("#facebox .header .close"));
- $(obj).remove();
+
+ $("h2.pageHeaderOnPage").hide();
+
+ if (pageTitle !== "" && $("#facebox .titleHeader").length > 0) {
+ $("#facebox .titleHeader").text(pageTitle);
+ }
+
+ evalTemplateUtils.debug.info("Page title for %s is %s", page_type, pageTitle);
};
$.facebox.setBtn = function(obj, form) {
@@ -122,9 +142,6 @@
},
fbResetClasses: function() {
$("#itemList").find(".editing").attr("class", "itemRow");
- if ($("#facebox .titleHeader").length > 0) {
- $("#facebox .titleHeader").remove();
- }
},
addItem: function(url) {
evalTemplateUtils.debug.info("Trying to fetch: %s", url);
Index: src/webapp/content/js/eval.assign.facebox.js
===================================================================
--- src/webapp/content/js/eval.assign.facebox.js (revision 69000)
+++ src/webapp/content/js/eval.assign.facebox.js (working copy)
@@ -29,6 +29,7 @@
'
| ' +
'
' +
'' +
'' +
'' +
@@ -77,11 +78,10 @@
};
$.facebox.setHeader = function(obj) {
- if ($("#facebox .titleHeader")) {
- $("#facebox .titleHeader").remove();
+
+ if ($("#facebox .titleHeader").length > 0 && typeof obj !== "undefined") {
+ $("#facebox .titleHeader").text(obj.text());
}
- $(obj).clone(true).insertBefore($("#facebox .header .close"));
- $(obj).remove();
};
};
Index: src/webapp/content/js/eval.template.utils.js
===================================================================
--- src/webapp/content/js/eval.template.utils.js (revision 69000)
+++ src/webapp/content/js/eval.template.utils.js (working copy)
@@ -4,7 +4,7 @@
var evalTemplateUtils = (function() {
//Configurable private variables
- var canDebug = false,
+ var canDebug = typeof window.console !== "undefined",
canDebugLevels = "info,debug,warn,error", //Comma delimitated set of the debug levels to show. Select from info,debug,warn,error
entityTemplateItemURL = "/direct/eval-templateitem/:ID:.xml",
messgeBundlePath = "/direct/eval-resources/message-bundle.json",
Index: src/webapp/content/js/eval.template.loader.events.js
===================================================================
--- src/webapp/content/js/eval.template.loader.events.js (revision 69000)
+++ src/webapp/content/js/eval.template.loader.events.js (working copy)
@@ -11,7 +11,7 @@
_modify_block = function(){
var siteId = $('#site-id').text();
SakaiProject.fckeditor.initializeEditor("item-text", siteId);
- $.facebox.setHeader($(".titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_block_page);
var baseId = ""; // "blockPage::";
@@ -181,7 +181,7 @@
modify_item: function() {
var siteId = $('#site-id').text();
SakaiProject.fckeditor.initializeEditor("item-text", siteId);
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_item_page);
if ($('.act .submit').attr('name').search(/templateBBean.saveTemplateItemToGroupAction/) !== -1) {
//proper submit skip validation - it is not important
} else if ($('.act .submit').attr('name').search(/templateBBean.saveItemAction/) === -1) {
@@ -216,7 +216,7 @@
$(document).trigger('close.facebox');
}
};
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_template_page);
evalTemplateUtils.frameGrow(0);
$('#basic-form').ajaxForm(o);
$('input.cancelButtonLightbox').bind("click", function() {
@@ -225,7 +225,7 @@
},
//choose expert items view
choose_expert_category: function(){
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.choose_expert_page);
$('a[rel*=facebox]').facebox();
},
preview_item: function(){
@@ -244,7 +244,7 @@
if ($('.fullDisplayHorizontal').length > 0) {
evalsys.instrumentDisplayHorizontal();
}
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.preview_item_page);
$("div.JSevalComment").evalComment(); //Bind comment boxes toggle link action
},
bindDeleteIcons : bindDeleteIcons,
Index: src/webapp/content/js/eval.assign.js
===================================================================
--- src/webapp/content/js/eval.assign.js (revision 69000)
+++ src/webapp/content/js/eval.assign.js (working copy)
@@ -29,7 +29,7 @@
*/
$.fn.assignSelector.defaults = {
type: 1, //Type is for type of category we are handling. ie: 0 = instructor, 1 = ta
- debug: false
+ debug: typeof window.console !== "undefined"
};
/**
* Private methods and variables
@@ -143,7 +143,6 @@
});
}
$.facebox.setHeader($("#title"));
- $("#facebox .header .titleHeader").show();
//Activate Mass (De)Selector controls
$("#selectorControl").bind('click', function(){
if (this.checked) {
Index: src/webapp/content/templates/control_items.html
===================================================================
--- src/webapp/content/templates/control_items.html (revision 69000)
+++ src/webapp/content/templates/control_items.html (working copy)
@@ -14,9 +14,13 @@
+
+
+
+
Index: src/webapp/content/templates/modify_block.html
===================================================================
--- src/webapp/content/templates/modify_block.html (revision 69000)
+++ src/webapp/content/templates/modify_block.html (working copy)
@@ -10,7 +10,6 @@
-
+
Index: src/webapp/content/templates/preview_item.html
===================================================================
--- src/webapp/content/templates/preview_item.html (revision 69000)
+++ src/webapp/content/templates/preview_item.html (working copy)
@@ -9,7 +9,6 @@
-
Index: src/webapp/content/templates/choose_expert_category.html
===================================================================
--- src/webapp/content/templates/choose_expert_category.html (revision 69000)
+++ src/webapp/content/templates/choose_expert_category.html (working copy)
@@ -5,19 +5,8 @@
Expert Items - Choose Category
-
-
-
-
-
-
+
- Message for user here
Index: src/webapp/content/templates/modify_item.html
===================================================================
--- src/webapp/content/templates/modify_item.html (revision 69000)
+++ src/webapp/content/templates/modify_item.html (working copy)
@@ -16,7 +16,6 @@
-
Item:
Index: src/java/org/sakaiproject/evaluation/tool/producers/ExpertCategoryProducer.java
===================================================================
--- src/java/org/sakaiproject/evaluation/tool/producers/ExpertCategoryProducer.java (revision 69000)
+++ src/java/org/sakaiproject/evaluation/tool/producers/ExpertCategoryProducer.java (working copy)
@@ -137,7 +137,6 @@
// create a copy of the VP and then set it to the right view (to avoid corrupting the original)
ExpertItemViewParameters eivp = (ExpertItemViewParameters) expertItemViewParameters.copyBase();
- UIMessage.make(tofill, "expert-items", "expert.expert.items");
UIMessage.make(tofill, "expert-items-category", "expert.category");
UIMessage.make(tofill, "choose-category-1", "expert.choose.category");
Index: src/webapp/content/js/eval.template.facebox.js
===================================================================
--- src/webapp/content/js/eval.template.facebox.js (revision 69000)
+++ src/webapp/content/js/eval.template.facebox.js (working copy)
@@ -34,6 +34,7 @@
' | ' +
' ' +
'' +
'' +
'' +
@@ -93,12 +94,31 @@
return false;
};
- $.facebox.setHeader = function(obj) {
- if ($("#facebox .titleHeader")) {
- $("#facebox .titleHeader").remove();
+ $.facebox.setHeader = function(page_type) {
+ var pageTitle = "";
+ if(page_type === evalTemplateUtils.pages.preview_item_page){
+ pageTitle = evalTemplateUtils.messageLocator("previewitem.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_block_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifyblock-page-title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_item_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifyitem.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.modify_template_page){
+ pageTitle = evalTemplateUtils.messageLocator("modifytemplatetitledesc.page.title");
+ }else
+ if(page_type === evalTemplateUtils.pages.choose_expert_page){
+ pageTitle = evalTemplateUtils.messageLocator("expert.expert.items");
}
- $(obj).clone(true).insertBefore($("#facebox .header .close"));
- $(obj).remove();
+
+ $("h2.pageHeaderOnPage").hide();
+
+ if (pageTitle !== "" && $("#facebox .titleHeader").length > 0) {
+ $("#facebox .titleHeader").text(pageTitle);
+ }
+
+ evalTemplateUtils.debug.info("Page title for %s is %s", page_type, pageTitle);
};
$.facebox.setBtn = function(obj, form) {
@@ -122,9 +142,6 @@
},
fbResetClasses: function() {
$("#itemList").find(".editing").attr("class", "itemRow");
- if ($("#facebox .titleHeader").length > 0) {
- $("#facebox .titleHeader").remove();
- }
},
addItem: function(url) {
evalTemplateUtils.debug.info("Trying to fetch: %s", url);
Index: src/webapp/content/js/eval.assign.facebox.js
===================================================================
--- src/webapp/content/js/eval.assign.facebox.js (revision 69000)
+++ src/webapp/content/js/eval.assign.facebox.js (working copy)
@@ -29,6 +29,7 @@
' | ' +
' ' +
'' +
'' +
'' +
@@ -77,11 +78,10 @@
};
$.facebox.setHeader = function(obj) {
- if ($("#facebox .titleHeader")) {
- $("#facebox .titleHeader").remove();
+
+ if ($("#facebox .titleHeader").length > 0 && typeof obj !== "undefined") {
+ $("#facebox .titleHeader").text(obj.text());
}
- $(obj).clone(true).insertBefore($("#facebox .header .close"));
- $(obj).remove();
};
};
Index: src/webapp/content/js/eval.template.utils.js
===================================================================
--- src/webapp/content/js/eval.template.utils.js (revision 69000)
+++ src/webapp/content/js/eval.template.utils.js (working copy)
@@ -4,7 +4,7 @@
var evalTemplateUtils = (function() {
//Configurable private variables
- var canDebug = false,
+ var canDebug = typeof window.console !== "undefined",
canDebugLevels = "info,debug,warn,error", //Comma delimitated set of the debug levels to show. Select from info,debug,warn,error
entityTemplateItemURL = "/direct/eval-templateitem/:ID:.xml",
messgeBundlePath = "/direct/eval-resources/message-bundle.json",
Index: src/webapp/content/js/eval.template.loader.events.js
===================================================================
--- src/webapp/content/js/eval.template.loader.events.js (revision 69000)
+++ src/webapp/content/js/eval.template.loader.events.js (working copy)
@@ -11,7 +11,7 @@
_modify_block = function(){
var siteId = $('#site-id').text();
SakaiProject.fckeditor.initializeEditor("item-text", siteId);
- $.facebox.setHeader($(".titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_block_page);
var baseId = ""; // "blockPage::";
@@ -181,7 +181,7 @@
modify_item: function() {
var siteId = $('#site-id').text();
SakaiProject.fckeditor.initializeEditor("item-text", siteId);
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_item_page);
if ($('.act .submit').attr('name').search(/templateBBean.saveTemplateItemToGroupAction/) !== -1) {
//proper submit skip validation - it is not important
} else if ($('.act .submit').attr('name').search(/templateBBean.saveItemAction/) === -1) {
@@ -216,7 +216,7 @@
$(document).trigger('close.facebox');
}
};
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.modify_template_page);
evalTemplateUtils.frameGrow(0);
$('#basic-form').ajaxForm(o);
$('input.cancelButtonLightbox').bind("click", function() {
@@ -225,7 +225,7 @@
},
//choose expert items view
choose_expert_category: function(){
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.choose_expert_page);
$('a[rel*=facebox]').facebox();
},
preview_item: function(){
@@ -244,7 +244,7 @@
if ($('.fullDisplayHorizontal').length > 0) {
evalsys.instrumentDisplayHorizontal();
}
- $.facebox.setHeader($(".portletBody .titleHeader"));
+ $.facebox.setHeader(evalTemplateUtils.pages.preview_item_page);
$("div.JSevalComment").evalComment(); //Bind comment boxes toggle link action
},
bindDeleteIcons : bindDeleteIcons,
Index: src/webapp/content/js/eval.assign.js
===================================================================
--- src/webapp/content/js/eval.assign.js (revision 69000)
+++ src/webapp/content/js/eval.assign.js (working copy)
@@ -29,7 +29,7 @@
*/
$.fn.assignSelector.defaults = {
type: 1, //Type is for type of category we are handling. ie: 0 = instructor, 1 = ta
- debug: false
+ debug: typeof window.console !== "undefined"
};
/**
* Private methods and variables
@@ -143,7 +143,6 @@
});
}
$.facebox.setHeader($("#title"));
- $("#facebox .header .titleHeader").show();
//Activate Mass (De)Selector controls
$("#selectorControl").bind('click', function(){
if (this.checked) {
Index: src/webapp/content/templates/control_items.html
===================================================================
--- src/webapp/content/templates/control_items.html (revision 69000)
+++ src/webapp/content/templates/control_items.html (working copy)
@@ -14,9 +14,13 @@
+
+
+
+
Index: src/webapp/content/templates/modify_block.html
===================================================================
--- src/webapp/content/templates/modify_block.html (revision 69000)
+++ src/webapp/content/templates/modify_block.html (working copy)
@@ -10,7 +10,6 @@
-
+
Index: src/webapp/content/templates/preview_item.html
===================================================================
--- src/webapp/content/templates/preview_item.html (revision 69000)
+++ src/webapp/content/templates/preview_item.html (working copy)
@@ -9,7 +9,6 @@
-
Index: src/webapp/content/templates/choose_expert_category.html
===================================================================
--- src/webapp/content/templates/choose_expert_category.html (revision 69000)
+++ src/webapp/content/templates/choose_expert_category.html (working copy)
@@ -5,19 +5,8 @@
Expert Items - Choose Category
-
-
-
-
-
-
+
- Message for user here
Index: src/webapp/content/templates/modify_item.html
===================================================================
--- src/webapp/content/templates/modify_item.html (revision 69000)
+++ src/webapp/content/templates/modify_item.html (working copy)
@@ -16,7 +16,6 @@
-
| | |