Author: ivol37 at gmail.com
Date: Fri Dec 17 14:44:25 2010
New Revision: 511
Log:
[AMDATU-160] Fixed last GUI issues
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.min.js
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
Fri Dec 17 14:44:25 2010
@@ -23,7 +23,7 @@
// Adds a gadget to the AppData of the current user
addWidgetToAppData = function(obj, startId, dashboard) {
var currentGadgets =
retrieveCurrentWidgetsInAppData(obj.metadata.securetoken);
- var gadgetId = startId + '-' + obj.url;
+ var gadgetId = startId + '-' + obj.metadata.gadgeturl;
// use appData opensocial call to add this gadget to the users appData
var postdata = '{"registeredgadgets":"';
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
Fri Dec 17 14:44:25 2010
@@ -185,6 +185,10 @@
if (typeof dashboard.widgets[wid] != 'undefined' && $('#' + wid).length
> 0) {
var wi = $('#' + wid);
column = dashboard.widgets[wid].column;
+
+ // add it to the column
+ wi.appendTo(column);
+
} else {
// build the widget
dashboard.log('Applying template : ' + opts.widgetTemplate,1);
@@ -192,6 +196,9 @@
var widgetStr = tmpl($('#' + opts.widgetTemplate).html(), obj);
var wi = $(widgetStr);
+ // add it to the column
+ wi.appendTo(column);
+
dashboard.widgets[wid] = widget({
id: wid,
element: wi,
@@ -202,10 +209,8 @@
open: obj.open,
metadata: obj.metadata
});
- }
+ }
- // add it to the column
- wi.appendTo(column);
dashboard.log('widgetAdded event thrown for widget ' + wid,2);
dashboard.widgets[wid].element.trigger("widgetAdded",
dashboard.widgets[wid]);
@@ -595,7 +600,7 @@
});
dashboard.element.live('dashboardOpenLayoutDialog', function(){
- dashboard.log('Opening dialog ' + layoutOpts.dialogId,5);
+ dashboard.log('Opening dialog ' + layoutOpts.dialogId,1);
$('#' + layoutOpts.dialogId).dialog('open');
// add the layout images
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.min.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.min.js
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.min.js
Fri Dec 17 14:44:25 2010
@@ -1 +1 @@
-(function(a){a.fn.dashboard=function(m){var k={};var f;var
j;k.layout;k.element=this;k.widgets={};k.widgetsToAdd={};k.widgetCategories={};k.initialized=false;k.serialize=function(){k.log("entering
serialize function",1);var o='{"layout": "'+k.layout.id+'", "data" : [';var
n=0;if(a("."+b.columnClass).length==0){k.log(b.columnClass+" class not
found",5)}a("."+b.columnClass).each(function(){a(this).children().each(function(){if(a(this).hasClass(b.widgetClass)){if(n>0){o+=","}o+=(k.getWidget(a(this).attr("id"))).serialize();n++}})});o+="]}";return
o};k.log=function(o,p){if(p>=b.debuglevel&&typeof console!="undefined"){var
n="";if(p==1){n="INFO"}if(p==2){n="EVENT"}if(p==3){n="WARNING"}if(p==5){n="ERROR"}console.log(n+"
- "+o)}};k.setLayout=function(n){k.log("entering setLayout function with
layout"+n,1);k.layout=n;f.remove();if(typeof
b.layoutClass!="undefined"){this.element.find("."+b.layoutClass).addClass(k.layout.classname)}else{this.element.html(k.layout.html)}a("."+b.columnClass).sortable({connectWith:a("."+b.columnClass),opacity:b.opacity,handle:"."+b.widgetHeaderClass,over:function(o,p){a(this).addClass("selectedcolumn")},out:function(o,p){a(this).removeClass("selectedcolumn")},receive:function(p,q){var
o=k.getWidget(q.item.attr("id"));o.setColumn(e(a(this).attr("class")))},deactivate:function(p,q){k.log("dropping
the widget",1);var o=a(this).children().length;if(o==0){k.log("adding the
empty text to the column",1);a(this).html('<div
class="emptycolumn">'+b.emptyColumnHtml+"</div>")}else{if(o==2){a(this).find(".emptycolumn").remove()}}},start:function(o,p){p.item.find("."+b.widgetTitleClass).addClass("noclick")},stop:function(o,p){setTimeout(function(){p.item.find("."+b.widgetTitleClass).removeClass("noclick")},300)}});g();k.log("dashboardLayoutLoaded
event thrown",2);k.element.trigger("dashboardLayoutLoaded")};function
g(){k.log("entering fixSortableColumns
function",1);a(".nonsortablecolumn").removeClass("nonsortablecolumn").addClass(b.columnClass);a("."+b.columnClass).filter(function(){return
a(thi!
s).css("
display")=="none"}).addClass("nonsortablecolumn").removeClass(b.columnClass)}function
e(o){k.log("entering getColumnIdentifier function",1);var q;var p=o.split("
");for(var
n=0;n<p.length;n++){if(p[n].indexOf(b.columnPrefix)===0){q=p[n]}}return
q.replace(b.columnPrefix,"")}k.loadLayout=function(){k.log("entering loadLayout
function",1);if(b.json_data.url.length>0){k.log("Getting JSON feed :
"+b.json_data.url,1);a.getJSON(b.json_data.url,function(n){if(n==null){alert("Unable
to get json. If you are using chrome: there is an issue with loading json with
local files. It works on a server
:-)",5);return}k.setLayout(c(n.layout));k.loadWidgets(n.data)})}else{k.setLayout(c(b.json_data.layout));k.loadWidgets(b.json_data.data)}};k.addWidget=function(r,p){k.log("entering
addWidget function",1);var q=r.id;if(typeof
k.widgets[q]!="undefined"&&a("#"+q).length>0){var
n=a("#"+q);p=k.widgets[q].column}else{k.log("Applying template :
"+b.widgetTemplate,1);if(a("#"+b.widgetTemplate).length==0){k.log('Template
"'+b.widgetTemplate+" not found",5)}var
o=tmpl(a("#"+b.widgetTemplate).html(),r);var
n=a(o);k.widgets[q]=h({id:q,element:n,column:r.column,url:(typeof
r.url!="undefined"?r.url:null),editurl:r.editurl,title:r.title,open:r.open,metadata:r.metadata})}n.appendTo(p);k.log("widgetAdded
event thrown for widget
"+q,2);k.widgets[q].element.trigger("widgetAdded",k.widgets[q]);if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+q,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetAdded",widget:n})}};k.loadWidgets=function(n){k.log("entering
loadWidgets
function",1);k.element.find("."+b.columnClass).empty();a(n).each(function(){var
o=this.column;k.addWidget(this,k.element.find("."+b.columnPrefix+o))});a("#"+b.tempDashboard).find("."+b.widgetClass).each(function(){var
o=k.element.find("."+b.columnClass+":first");a(this).appendTo(o);k.getWidget(a(this).attr("id")).column=o.attr("id")});a("#"+b.tempDashboard).remove();a("."+b.columnClass).each(function(){if(a(this).children().length==0){a(this).html!
('<div c
lass="emptycolumn">'+b.emptyColumnHtml+"</div>")}});k.initialized=true};k.init=function(){k.log("entering
init function",1);k.loadLayout()};k.getWidget=function(n){k.log("entering
getWidget function",1);return k.widgets[n]};var
b=a.extend({},a.fn.dashboard.defaults,m);var
l=a.extend({},a.fn.dashboard.defaults.addWidgetSettings,m.addWidgetSettings);var
d=a.extend({},a.fn.dashboard.defaults.editLayoutSettings,m.editLayoutSettings);var
f=a(b.loadingHtml).appendTo(k.element);function h(n){k.log("entering widget
constructor",1);n=a.extend({},a.fn.dashboard.widget.defaults,n);n.openContent=function(){k.log("entering
openContent
function",1);n.open=true;if(!n.loaded){if(this.url!=""&&this.url!=null&&typeof
this.url!="undefined"){a(b.loadingHtml).appendTo(n.element.find("."+b.widgetContentClass));n.element.find("."+b.widgetContentClass).load(this.url,function(p,o,q){if(o=="error"){n.element.find("."+b.widgetContentClass).html(b.widgetNotFoundMessage)}n.loaded=true;n.element.find("."+b.widgetContentClass).show();k.log("widgetLoaded
event thrown for widget
"+n.id,2);n.element.trigger("widgetLoaded",n)})}else{k.log("widgetLoaded event
thrown",2);n.element.trigger("widgetLoaded",n)}}else{n.element.find("."+b.widgetContentClass).show()}if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetOpened",widget:n})}};n.setColumn=function(o){k.log("entering
setColumn function and setting widget "+n.id+" into column
"+o,1);n.column=o;k.log("dashboardStateChange event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetMoved",widget:n})},n.refreshContent=function(){k.log("entering
refreshContent
function",1);n.loaded=false;if(n.open){n.openContent()}};n.setTitle=function(o){k.log("entering
setTitle
function",1);n.title=o;n.element.find("."+b.widgetTitleClass).html(o);if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"titleC!
hanged",
widget:n})}};n.closeContent=function(){k.log("entering closeContent
function",1);n.open=false;n.element.find("."+b.widgetContentClass).hide();k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetClosed",widget:n})};n.setMetadata=function(o,p){k.log("entering
setMetadata function",1);if(typeof
n.metadata=="undefined"){n.metadata={}}n.metadata[o]=p;k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"metadataChanged",widget:n})};n.openMenu=function(){k.log("entering
openMenu
function",1);n.element.find("."+b.menuClass).show()};n.closeMenu=function(){k.log("entering
closeMenu
function",1);n.element.find("."+b.menuClass).hide()};n.remove=function(){k.log("entering
remove function",1);n.element.remove();k.log("widgetDeleted event thrown for
widget
"+n.id,2);n.element.trigger("widgetDeleted",n);k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetRemoved",widget:n})};n.serialize=function(){k.log("entering
serialize function",1);var q='{"title" : "'+n.title+'", "id" : "'+n.id+'",
"column" : "'+n.column+'","editurl" : "'+n.editurl+'","open" : '+n.open+',"url"
: "'+n.url+'"';if(typeof n.metadata!="undefined"){q+=',"metadata":{';var
s=n.metadata;var o=0;for(var p in
s){if(o>0){q+=","}q+='"'+p+'":"'+s[p]+'"';o++}q+="}"}q+="}";return
q};n.openFullscreen=function(){k.log("entering openFullscreen
function",1);n.fullscreen=true;var q=n.element.clone();var p=a('<div
style="display:none"
id="tempdashboard"></div>');p.appendTo(a("body"));k.element.children().appendTo(p);var
o=a('<a id="fullscreenclose">Back</a><p /><ul
id="fullscreen"></ul>');o.appendTo(k.element);q.appendTo(a("#fullscreen"))};n.closeFullscreen=function(){k.log("entering
closeFullscreen
function",1);n.fullscreen=false;a("#fullscreenclose").remove();a("#fullscreen").remove();a("#tempdashboard").children().appendTo(k.element);a("#tempdashboard").remove()};n!
.openSet
tings=function(){k.log("entering openSettings
function",1);n.element.find("."+b.widgetContentClass).load(n.editurl)};if(n.open){n.openContent()}return
n}function c(p){k.log("entering getLayout function",1);var n=null;var
o;a.each(b.layouts,function(q,r){if(q==0){o=r}if(r.id==p){n=r}});if(n==null){n=o}return
n}a(".menutrigger").live("click",function(){k.log("widgetOpenMenu event thrown
for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetOpenMenu");return
false});a(".widgetopenfullscreen").live("click",function(n){k.log("widgetCloseMenu
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetCloseMenu");k.log("widgetOpenFullScreen
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetOpenFullScreen");return
false});a(".controls li").live("click",function(n){k.log("widgetCloseMenu
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetCloseMenu");k.log(a(this).attr("class")+"
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger(a(this).attr("class"));return
false});a("."+b.widgetClass).live("widgetCloseMenu",function(){k.log("Closing
menu
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).closeMenu()});a("."+b.widgetClass).live("widgetOpenMenu",function(){k.log("Opening
menu
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).openMenu()});a("."+b.widgetClass).live("widgetdelete",function(){if(confirm(b.deleteConfirmMessage)){k.log("Removing
widget
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).remove()}});a("."+b.widgetClass).live("widgetreload",function(){k.getWidget(a(this).attr("id")).refreshContent()});a("."+b.widgetClass).live("widgetTitleChange",function(n,o){k.getWidget(a(this).attr("id")).setTitle(o)});a("."+b.widgetClass).live("widgetClose",function(){k.log("Closing
widget
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).closeContent()});a("."+b.widgetClass).live("widgetOpen",function(){k.log("Opening
widget "+a(this).attr("id"),1);k.getWidget(a(!
this).at
tr("id")).openContent()});a("."+b.widgetClass).live("metadataChange",function(o,n,p){k.log("Changing
metadata for widget "+a(this).attr("id")+", metadata name: "+n+", value:
"+p,1);k.getWidget(a(this).attr("id")).setMetadata(n,p)});a("."+b.widgetTitleClass).live("click",function(o){k.log("Click
on the header detected for widget
"+a(this).attr("id"),1);if(!a(this).hasClass("noclick")){wiObj=a(this).closest("."+b.widgetClass);var
n=k.getWidget(wiObj.attr("id"));if(n.open){k.log("widgetClose event thrown for
widget "+n,2);wiObj.trigger("widgetClose")}else{k.log("widgetOpen event thrown
for widget
"+n,2);wiObj.trigger("widgetOpen")}}});a("."+b.widgetHeaderClass).live("mouseover",function(){a(this).find("."+b.iconsClass).removeClass("hidden")});a("."+b.widgetHeaderClass).live("mouseout",function(){a(this).find("."+b.iconsClass).addClass("hidden")});a("#fullscreenclose").live("click",function(){k.log("widgetCloseFullScreen
event
thrown",2);k.element.find("."+b.widgetClass).trigger("widgetCloseFullScreen")});a("."+b.widgetClass).live("widgetOpenFullScreen",function(){k.getWidget(a(this).attr("id")).openFullscreen()});a("."+b.widgetClass).live("widgetCloseFullScreen",function(){k.getWidget(a(this).attr("id")).closeFullscreen()});a("."+b.widgetClass).live("widgetedit",function(){k.getWidget(a(this).attr("id")).openSettings()});if(a("#"+l.dialogId).length==0){k.log("Unable
to find
"+l.dialogId,5)}a("#"+l.dialogId).dialog({autoOpen:false,height:414,width:550,modal:true,buttons:{Cancel:function(){a(this).dialog("close")}},close:function(){}});if(a("#"+d.dialogId).length==0){k.log("Unable
to find
"+d.dialogId,5)}a("#"+d.dialogId).dialog({autoOpen:false,height:300,width:600,modal:true});a("."+d.editLayoutClass).live("click",function(){k.log("dashboardOpenLayoutDialog
event
thrown",2);k.element.trigger("dashboardOpenLayoutDialog")});k.element.live("dashboardOpenLayoutDialog",function(){k.log("Opening
dialog "+d.dialogId,5);a("#"+d.dialogId).dialog("open");var
n=a("#"+d.dialogId).find("."+d.layoutClass);if(n.children().!
length==
0){k.log("Number of layouts :
"+b.layouts.length,1);a.each(b.layouts,function(o,p){k.log("Applying template :
"+d.layoutTemplate,1);if(a("#"+d.layoutTemplate).length==0){k.log('Template
"'+d.layoutTemplate+" not
found",5)}n.append(tmpl(a("#"+d.layoutTemplate).html(),p))})}a("."+d.selectLayoutClass).removeClass(d.selectedLayoutClass);a("#"+k.layout.id).addClass(d.selectedLayoutClass);i()});k.element.live("dashboardStateChange",function(){if(typeof
b.stateChangeUrl!="undefined"&&b.stateChangeUrl!=null){a.ajax({type:"POST",url:b.stateChangeUrl,data:{dashboard:k.element.attr("id"),settings:k.serialize()},success:function(n){if(n=="NOK"||n.indexOf("<response>NOK</response>")!=-1){k.log(b.saveFailedMessage,5);k.log("dashboardSaveFailed
event
thrown",2);k.element.trigger("dashboardSaveFailed")}else{k.log("dashboardSuccessfulSaved
event
thrown",2);k.element.trigger("dashboardSuccessfulSaved")}},error:function(n,p,o){k.log(b.saveFailedMessage,5);k.log("dashboardSaveFailed
event
thrown",2);k.element.trigger("dashboardSaveFailed")},dataType:"text"})}});k.element.live("dashboardCloseLayoutDialog",function(){a("#"+d.dialogId).dialog("close")});function
i(){if(a("."+d.selectLayoutClass).length==0){k.log("Unable to find
"+d.selectLayoutClass,5)}a("."+d.selectLayoutClass).bind("click",function(q){var
o=k.layout;k.log("dashboardCloseLayoutDialog event
thrown",2);k.element.trigger("dashboardCloseLayoutDialog");var
p=c(a(this).attr("id"));k.layout=p;if(typeof
b.layoutClass!="undefined"){k.element.find("."+b.layoutClass).removeClass(o.classname).addClass(p.classname);g();if(a("."+b.columnClass).length==0){k.log("Unable
to find
"+b.columnClass,5)}k.element.find("."+b.columnClass).each(function(){if(a(this).css("display")=="none"){a(this).children().appendTo(k.element.find("."+b.columnClass+":first"))}a(".emptycolumn").remove();a("."+b.columnClass).each(function(){if(a(this).children().length==0){a(this).html('<div
class="emptycolumn">'+b.emptyColumnHtml+"</div>")}})})}else{var n=a('<div
style="display:none" id="'+b.tempDashb!
oard+'">
</div>');n.appendTo(a("body"));k.element.children().appendTo(n);k.init()}k.log("dashboardChangeLayout
event
thrown",2);a("body").trigger("dashboardChangeLayout")})}a("."+l.selectCategoryClass).live("click",function(){k.log("selectCategory
event
thrown",2);k.element.trigger("selectCategory",a(this))});k.element.live("selectCategory",function(o,n){a("."+l.selectCategoryClass).removeClass(l.selectedCategoryClass);a("#"+l.dialogId).find("."+l.widgetClass).empty();a(n).addClass(l.selectedCategoryClass);url=k.widgetCategories[a(n).attr("id")];k.log("Getting
JSON feed :
"+url,1);a.getJSON(url,{cache:true},function(p){if(p.data==0){k.log("Empty data
returned",3)}a.each(p.data,function(r,s){k.widgetsToAdd[s.id]=s;k.log("Applying
template :
"+l.widgetTemplate,1);if(a("#"+l.widgetTemplate).length==0){k.log('Template
"'+l.widgetTemplate+" not found",5)}var
q=tmpl(a("#"+l.widgetTemplate).html(),s);a("#"+l.dialogId).find("."+l.widgetClass).append(q)})});k.log("addWidgetDialogWidgetsLoaded
event
thrown",2);k.element.trigger("addWidgetDialogWidgetsLoaded")});a("."+l.addWidgetClass).live("click",function(){var
n=k.widgetsToAdd[a(this).attr("id").replace("addwidget","")];k.log("dashboardAddWidget
event
thrown",2);k.element.trigger("dashboardAddWidget",n);k.log("dashboardCloseWidgetDialog
event
thrown",2);k.element.trigger("dashboardCloseWidgetDialog")});a("."+l.openDialogClass).live("click",function(){k.log("dashboardOpenWidgetDialog
event
thrown",2);k.element.trigger("dashboardOpenWidgetDialog")});k.element.live("dashboardCloseWidgetDialog",function(){a("#"+l.dialogId).dialog("close")});k.element.live("dashboardOpenWidgetDialog",function(){a("#"+l.dialogId).find("."+l.categoryClass).empty();a("#"+l.dialogId).find("."+l.widgetClass).empty();k.log("Opening
dialog "+l.dialogId,5);a("#"+l.dialogId).dialog("open");k.log("Getting JSON
feed :
"+l.widgetDirectoryUrl,1);a.getJSON(l.widgetDirectoryUrl,function(n){if(n.category==0){k.log("Empty
data
returned",3)}a.each(n.category,function(p,q){k.widgetCategories[q.id]=q.url;k.log("!
Applying
template :
"+l.categoryTemplate,1);if(a("#"+l.categoryTemplate).length==0){k.log('Template
"'+l.categoryTemplate+" not found",5)}var
o=tmpl(a("#"+l.categoryTemplate).html(),q);a("#"+l.dialogId).find("."+l.categoryClass).append(o)});k.log("addWidgetDialogCategoriesLoaded
event
thrown",2);k.element.trigger("addWidgetDialogCategoriesLoaded");k.log("selectCategory
event
thrown",2);k.element.trigger("selectCategory",a("#"+l.dialogId).find("."+l.categoryClass+">li:first"))})});return
k};a.fn.dashboard.defaults={debuglevel:3,json_data:{},fullscreenHeaderInner:'<img
alt="Close this widget" src="images/close.gif" /> Return to
Dashboard',loadingHtml:'<div class="loading"><img alt="Loading, please wait"
src="../themes/default/loading.gif"
/><p>Loading...</p></div>',emptyColumnHtml:"Drag your widgets
here",tempDashboard:"tempDashboard",widgetTemplate:"widgettemplate",columnPrefix:"column-",opacity:"0.2",deleteConfirmMessage:"Are
you sure you want to delete this widget?",saveFailedMessage:"Saving failed.
Please reload the page.",widgetNotFoundMessage:"The content of this widget is
not available anymore. You may remove this
widget.",columnClass:"column",widgetClass:"widget",menuClass:"controls",widgetContentClass:"widgetcontent",widgetTitleClass:"widgettitle",widgetHeaderClass:"widgetheader",iconsClass:"icons",addWidgetSettings:{openDialogClass:"openaddwidgetdialog",addWidgetClass:"addwidget",selectCategoryClass:"selectcategory",selectedCategoryClass:"selected",categoryClass:"categories",widgetClass:"widgets",dialogId:"addwidgetdialog",categoryTemplate:"categorytemplate",widgetTemplate:"addwidgettemplate"},editLayoutSettings:{dialogId:"editLayout",layoutClass:"layoutselection",selectLayoutClass:"layoutchoice",selectedLayoutClass:"selected",editLayoutClass:"editlayout",layoutTemplate:"selectlayouttemplate"}};a.fn.dashboard.widget={defaults:{open:true,fullscreen:false,loaded:false,url:"",metadata:{}}}})(jQuery);(function(){var
b={};this.tmpl=function a(e,d){var
c=!/\W/.test(e)?b[e]=b[e]||a(document.getElementById(e).in!
nerHTML)
:new Function("obj","var
p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+e.replace(/[\r\t\n]/g,"
").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return
p.join('');");return d?c(d):c}})();
\ No newline at end of file
+(function(a){a.fn.dashboard=function(m){var k={};var f;var
j;k.layout;k.element=this;k.widgets={};k.widgetsToAdd={};k.widgetCategories={};k.initialized=false;k.serialize=function(){k.log("entering
serialize function",1);var o='{"layout": "'+k.layout.id+'", "data" : [';var
n=0;if(a("."+b.columnClass).length==0){k.log(b.columnClass+" class not
found",5)}a("."+b.columnClass).each(function(){a(this).children().each(function(){if(a(this).hasClass(b.widgetClass)){if(n>0){o+=","}o+=(k.getWidget(a(this).attr("id"))).serialize();n++}})});o+="]}";return
o};k.log=function(o,p){if(p>=b.debuglevel&&typeof console!="undefined"){var
n="";if(p==1){n="INFO"}if(p==2){n="EVENT"}if(p==3){n="WARNING"}if(p==5){n="ERROR"}console.log(n+"
- "+o)}};k.setLayout=function(n){k.log("entering setLayout function with
layout"+n,1);k.layout=n;f.remove();if(typeof
b.layoutClass!="undefined"){this.element.find("."+b.layoutClass).addClass(k.layout.classname)}else{this.element.html(k.layout.html)}a("."+b.columnClass).sortable({connectWith:a("."+b.columnClass),opacity:b.opacity,handle:"."+b.widgetHeaderClass,over:function(o,p){a(this).addClass("selectedcolumn")},out:function(o,p){a(this).removeClass("selectedcolumn")},receive:function(p,q){var
o=k.getWidget(q.item.attr("id"));o.setColumn(e(a(this).attr("class")))},deactivate:function(p,q){k.log("dropping
the widget",1);var o=a(this).children().length;if(o==0){k.log("adding the
empty text to the column",1);a(this).html('<div
class="emptycolumn">'+b.emptyColumnHtml+"</div>")}else{if(o==2){a(this).find(".emptycolumn").remove()}}},start:function(o,p){p.item.find("."+b.widgetTitleClass).addClass("noclick")},stop:function(o,p){setTimeout(function(){p.item.find("."+b.widgetTitleClass).removeClass("noclick")},300)}});g();k.log("dashboardLayoutLoaded
event thrown",2);k.element.trigger("dashboardLayoutLoaded")};function
g(){k.log("entering fixSortableColumns
function",1);a(".nonsortablecolumn").removeClass("nonsortablecolumn").addClass(b.columnClass);a("."+b.columnClass).filter(function(){return
a(thi!
s).css("
display")=="none"}).addClass("nonsortablecolumn").removeClass(b.columnClass)}function
e(o){k.log("entering getColumnIdentifier function",1);var q;var p=o.split("
");for(var
n=0;n<p.length;n++){if(p[n].indexOf(b.columnPrefix)===0){q=p[n]}}return
q.replace(b.columnPrefix,"")}k.loadLayout=function(){k.log("entering loadLayout
function",1);if(b.json_data.url.length>0){k.log("Getting JSON feed :
"+b.json_data.url,1);a.getJSON(b.json_data.url,function(n){if(n==null){alert("Unable
to get json. If you are using chrome: there is an issue with loading json with
local files. It works on a server
:-)",5);return}k.setLayout(c(n.layout));k.loadWidgets(n.data)})}else{k.setLayout(c(b.json_data.layout));k.loadWidgets(b.json_data.data)}};k.addWidget=function(r,p){k.log("entering
addWidget function",1);var q=r.id;if(typeof
k.widgets[q]!="undefined"&&a("#"+q).length>0){var
n=a("#"+q);p=k.widgets[q].column;n.appendTo(p)}else{k.log("Applying template :
"+b.widgetTemplate,1);if(a("#"+b.widgetTemplate).length==0){k.log('Template
"'+b.widgetTemplate+" not found",5)}var
o=tmpl(a("#"+b.widgetTemplate).html(),r);var
n=a(o);n.appendTo(p);k.widgets[q]=h({id:q,element:n,column:r.column,url:(typeof
r.url!="undefined"?r.url:null),editurl:r.editurl,title:r.title,open:r.open,metadata:r.metadata})}k.log("widgetAdded
event thrown for widget
"+q,2);k.widgets[q].element.trigger("widgetAdded",k.widgets[q]);if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+q,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetAdded",widget:n})}};k.loadWidgets=function(n){k.log("entering
loadWidgets
function",1);k.element.find("."+b.columnClass).empty();a(n).each(function(){var
o=this.column;k.addWidget(this,k.element.find("."+b.columnPrefix+o))});a("#"+b.tempDashboard).find("."+b.widgetClass).each(function(){var
o=k.element.find("."+b.columnClass+":first");a(this).appendTo(o);k.getWidget(a(this).attr("id")).column=o.attr("id")});a("#"+b.tempDashboard).remove();a("."+b.columnClass).each(function(){if(a(this).children().length==0!
){a(this
).html('<div
class="emptycolumn">'+b.emptyColumnHtml+"</div>")}});k.initialized=true};k.init=function(){k.log("entering
init function",1);k.loadLayout()};k.getWidget=function(n){k.log("entering
getWidget function",1);return k.widgets[n]};var
b=a.extend({},a.fn.dashboard.defaults,m);var
l=a.extend({},a.fn.dashboard.defaults.addWidgetSettings,m.addWidgetSettings);var
d=a.extend({},a.fn.dashboard.defaults.editLayoutSettings,m.editLayoutSettings);var
f=a(b.loadingHtml).appendTo(k.element);function h(n){k.log("entering widget
constructor",1);n=a.extend({},a.fn.dashboard.widget.defaults,n);n.openContent=function(){k.log("entering
openContent
function",1);n.open=true;if(!n.loaded){if(this.url!=""&&this.url!=null&&typeof
this.url!="undefined"){a(b.loadingHtml).appendTo(n.element.find("."+b.widgetContentClass));n.element.find("."+b.widgetContentClass).load(this.url,function(p,o,q){if(o=="error"){n.element.find("."+b.widgetContentClass).html(b.widgetNotFoundMessage)}n.loaded=true;n.element.find("."+b.widgetContentClass).show();k.log("widgetLoaded
event thrown for widget
"+n.id,2);n.element.trigger("widgetLoaded",n)})}else{k.log("widgetLoaded event
thrown",2);n.element.trigger("widgetLoaded",n)}}else{n.element.find("."+b.widgetContentClass).show()}if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetOpened",widget:n})}};n.setColumn=function(o){k.log("entering
setColumn function and setting widget "+n.id+" into column
"+o,1);n.column=o;k.log("dashboardStateChange event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetMoved",widget:n})},n.refreshContent=function(){k.log("entering
refreshContent
function",1);n.loaded=false;if(n.open){n.openContent()}};n.setTitle=function(o){k.log("entering
setTitle
function",1);n.title=o;n.element.find("."+b.widgetTitleClass).html(o);if(k.initialized){k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{state!
Change:"
titleChanged",widget:n})}};n.closeContent=function(){k.log("entering
closeContent
function",1);n.open=false;n.element.find("."+b.widgetContentClass).hide();k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetClosed",widget:n})};n.setMetadata=function(o,p){k.log("entering
setMetadata function",1);if(typeof
n.metadata=="undefined"){n.metadata={}}n.metadata[o]=p;k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"metadataChanged",widget:n})};n.openMenu=function(){k.log("entering
openMenu
function",1);n.element.find("."+b.menuClass).show()};n.closeMenu=function(){k.log("entering
closeMenu
function",1);n.element.find("."+b.menuClass).hide()};n.remove=function(){k.log("entering
remove function",1);n.element.remove();k.log("widgetDeleted event thrown for
widget
"+n.id,2);n.element.trigger("widgetDeleted",n);k.log("dashboardStateChange
event thrown for widget
"+n.id,2);k.element.trigger("dashboardStateChange",{stateChange:"widgetRemoved",widget:n})};n.serialize=function(){k.log("entering
serialize function",1);var q='{"title" : "'+n.title+'", "id" : "'+n.id+'",
"column" : "'+n.column+'","editurl" : "'+n.editurl+'","open" : '+n.open+',"url"
: "'+n.url+'"';if(typeof n.metadata!="undefined"){q+=',"metadata":{';var
s=n.metadata;var o=0;for(var p in
s){if(o>0){q+=","}q+='"'+p+'":"'+s[p]+'"';o++}q+="}"}q+="}";return
q};n.openFullscreen=function(){k.log("entering openFullscreen
function",1);n.fullscreen=true;var q=n.element.clone();var p=a('<div
style="display:none"
id="tempdashboard"></div>');p.appendTo(a("body"));k.element.children().appendTo(p);var
o=a('<a id="fullscreenclose">Back</a><p /><ul
id="fullscreen"></ul>');o.appendTo(k.element);q.appendTo(a("#fullscreen"))};n.closeFullscreen=function(){k.log("entering
closeFullscreen
function",1);n.fullscreen=false;a("#fullscreenclose").remove();a("#fullscreen").remove();a("#tempdashboard").children().appendTo(k.element);a("#tempdashboard!
").remov
e()};n.openSettings=function(){k.log("entering openSettings
function",1);n.element.find("."+b.widgetContentClass).load(n.editurl)};if(n.open){n.openContent()}return
n}function c(p){k.log("entering getLayout function",1);var n=null;var
o;a.each(b.layouts,function(q,r){if(q==0){o=r}if(r.id==p){n=r}});if(n==null){n=o}return
n}a(".menutrigger").live("click",function(){k.log("widgetOpenMenu event thrown
for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetOpenMenu");return
false});a(".widgetopenfullscreen").live("click",function(n){k.log("widgetCloseMenu
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetCloseMenu");k.log("widgetOpenFullScreen
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetOpenFullScreen");return
false});a(".controls li").live("click",function(n){k.log("widgetCloseMenu
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger("widgetCloseMenu");k.log(a(this).attr("class")+"
event thrown for widget
"+h.id,2);a(this).closest("."+b.widgetClass).trigger(a(this).attr("class"));return
false});a("."+b.widgetClass).live("widgetCloseMenu",function(){k.log("Closing
menu
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).closeMenu()});a("."+b.widgetClass).live("widgetOpenMenu",function(){k.log("Opening
menu
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).openMenu()});a("."+b.widgetClass).live("widgetdelete",function(){if(confirm(b.deleteConfirmMessage)){k.log("Removing
widget
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).remove()}});a("."+b.widgetClass).live("widgetreload",function(){k.getWidget(a(this).attr("id")).refreshContent()});a("."+b.widgetClass).live("widgetTitleChange",function(n,o){k.getWidget(a(this).attr("id")).setTitle(o)});a("."+b.widgetClass).live("widgetClose",function(){k.log("Closing
widget
"+a(this).attr("id"),1);k.getWidget(a(this).attr("id")).closeContent()});a("."+b.widgetClass).live("widgetOpen",function(){k.log("Opening
widget "+a(this).attr("id"),1);!
k.getWid
get(a(this).attr("id")).openContent()});a("."+b.widgetClass).live("metadataChange",function(o,n,p){k.log("Changing
metadata for widget "+a(this).attr("id")+", metadata name: "+n+", value:
"+p,1);k.getWidget(a(this).attr("id")).setMetadata(n,p)});a("."+b.widgetTitleClass).live("click",function(o){k.log("Click
on the header detected for widget
"+a(this).attr("id"),1);if(!a(this).hasClass("noclick")){wiObj=a(this).closest("."+b.widgetClass);var
n=k.getWidget(wiObj.attr("id"));if(n.open){k.log("widgetClose event thrown for
widget "+n,2);wiObj.trigger("widgetClose")}else{k.log("widgetOpen event thrown
for widget
"+n,2);wiObj.trigger("widgetOpen")}}});a("."+b.widgetHeaderClass).live("mouseover",function(){a(this).find("."+b.iconsClass).removeClass("hidden")});a("."+b.widgetHeaderClass).live("mouseout",function(){a(this).find("."+b.iconsClass).addClass("hidden")});a("#fullscreenclose").live("click",function(){k.log("widgetCloseFullScreen
event
thrown",2);k.element.find("."+b.widgetClass).trigger("widgetCloseFullScreen")});a("."+b.widgetClass).live("widgetOpenFullScreen",function(){k.getWidget(a(this).attr("id")).openFullscreen()});a("."+b.widgetClass).live("widgetCloseFullScreen",function(){k.getWidget(a(this).attr("id")).closeFullscreen()});a("."+b.widgetClass).live("widgetedit",function(){k.getWidget(a(this).attr("id")).openSettings()});if(a("#"+l.dialogId).length==0){k.log("Unable
to find
"+l.dialogId,5)}a("#"+l.dialogId).dialog({autoOpen:false,height:414,width:550,modal:true,buttons:{Cancel:function(){a(this).dialog("close")}},close:function(){}});if(a("#"+d.dialogId).length==0){k.log("Unable
to find
"+d.dialogId,5)}a("#"+d.dialogId).dialog({autoOpen:false,height:300,width:600,modal:true});a("."+d.editLayoutClass).live("click",function(){k.log("dashboardOpenLayoutDialog
event
thrown",2);k.element.trigger("dashboardOpenLayoutDialog")});k.element.live("dashboardOpenLayoutDialog",function(){k.log("Opening
dialog "+d.dialogId,1);a("#"+d.dialogId).dialog("open");var
n=a("#"+d.dialogId).find("."+d.layoutClass);if!
(n.child
ren().length==0){k.log("Number of layouts :
"+b.layouts.length,1);a.each(b.layouts,function(o,p){k.log("Applying template :
"+d.layoutTemplate,1);if(a("#"+d.layoutTemplate).length==0){k.log('Template
"'+d.layoutTemplate+" not
found",5)}n.append(tmpl(a("#"+d.layoutTemplate).html(),p))})}a("."+d.selectLayoutClass).removeClass(d.selectedLayoutClass);a("#"+k.layout.id).addClass(d.selectedLayoutClass);i()});k.element.live("dashboardStateChange",function(){if(typeof
b.stateChangeUrl!="undefined"&&b.stateChangeUrl!=null){a.ajax({type:"POST",url:b.stateChangeUrl,data:{dashboard:k.element.attr("id"),settings:k.serialize()},success:function(n){if(n=="NOK"||n.indexOf("<response>NOK</response>")!=-1){k.log(b.saveFailedMessage,5);k.log("dashboardSaveFailed
event
thrown",2);k.element.trigger("dashboardSaveFailed")}else{k.log("dashboardSuccessfulSaved
event
thrown",2);k.element.trigger("dashboardSuccessfulSaved")}},error:function(n,p,o){k.log(b.saveFailedMessage,5);k.log("dashboardSaveFailed
event
thrown",2);k.element.trigger("dashboardSaveFailed")},dataType:"text"})}});k.element.live("dashboardCloseLayoutDialog",function(){a("#"+d.dialogId).dialog("close")});function
i(){if(a("."+d.selectLayoutClass).length==0){k.log("Unable to find
"+d.selectLayoutClass,5)}a("."+d.selectLayoutClass).bind("click",function(q){var
o=k.layout;k.log("dashboardCloseLayoutDialog event
thrown",2);k.element.trigger("dashboardCloseLayoutDialog");var
p=c(a(this).attr("id"));k.layout=p;if(typeof
b.layoutClass!="undefined"){k.element.find("."+b.layoutClass).removeClass(o.classname).addClass(p.classname);g();if(a("."+b.columnClass).length==0){k.log("Unable
to find
"+b.columnClass,5)}k.element.find("."+b.columnClass).each(function(){if(a(this).css("display")=="none"){a(this).children().appendTo(k.element.find("."+b.columnClass+":first"))}a(".emptycolumn").remove();a("."+b.columnClass).each(function(){if(a(this).children().length==0){a(this).html('<div
class="emptycolumn">'+b.emptyColumnHtml+"</div>")}})})}else{var n=a('<div
style="display:none" id=!
"'+b.tem
pDashboard+'"></div>');n.appendTo(a("body"));k.element.children().appendTo(n);k.init()}k.log("dashboardChangeLayout
event
thrown",2);a("body").trigger("dashboardChangeLayout")})}a("."+l.selectCategoryClass).live("click",function(){k.log("selectCategory
event
thrown",2);k.element.trigger("selectCategory",a(this))});k.element.live("selectCategory",function(o,n){a("."+l.selectCategoryClass).removeClass(l.selectedCategoryClass);a("#"+l.dialogId).find("."+l.widgetClass).empty();a(n).addClass(l.selectedCategoryClass);url=k.widgetCategories[a(n).attr("id")];k.log("Getting
JSON feed :
"+url,1);a.getJSON(url,{cache:true},function(p){if(p.data==0){k.log("Empty data
returned",3)}a.each(p.data,function(r,s){k.widgetsToAdd[s.id]=s;k.log("Applying
template :
"+l.widgetTemplate,1);if(a("#"+l.widgetTemplate).length==0){k.log('Template
"'+l.widgetTemplate+" not found",5)}var
q=tmpl(a("#"+l.widgetTemplate).html(),s);a("#"+l.dialogId).find("."+l.widgetClass).append(q)})});k.log("addWidgetDialogWidgetsLoaded
event
thrown",2);k.element.trigger("addWidgetDialogWidgetsLoaded")});a("."+l.addWidgetClass).live("click",function(){var
n=k.widgetsToAdd[a(this).attr("id").replace("addwidget","")];k.log("dashboardAddWidget
event
thrown",2);k.element.trigger("dashboardAddWidget",n);k.log("dashboardCloseWidgetDialog
event
thrown",2);k.element.trigger("dashboardCloseWidgetDialog")});a("."+l.openDialogClass).live("click",function(){k.log("dashboardOpenWidgetDialog
event
thrown",2);k.element.trigger("dashboardOpenWidgetDialog")});k.element.live("dashboardCloseWidgetDialog",function(){a("#"+l.dialogId).dialog("close")});k.element.live("dashboardOpenWidgetDialog",function(){a("#"+l.dialogId).find("."+l.categoryClass).empty();a("#"+l.dialogId).find("."+l.widgetClass).empty();k.log("Opening
dialog "+l.dialogId,5);a("#"+l.dialogId).dialog("open");k.log("Getting JSON
feed :
"+l.widgetDirectoryUrl,1);a.getJSON(l.widgetDirectoryUrl,function(n){if(n.category==0){k.log("Empty
data returned",3)}a.each(n.category,function(p,q){k.widgetCategories[q.id]!
=q.url;k
.log("Applying template :
"+l.categoryTemplate,1);if(a("#"+l.categoryTemplate).length==0){k.log('Template
"'+l.categoryTemplate+" not found",5)}var
o=tmpl(a("#"+l.categoryTemplate).html(),q);a("#"+l.dialogId).find("."+l.categoryClass).append(o)});k.log("addWidgetDialogCategoriesLoaded
event
thrown",2);k.element.trigger("addWidgetDialogCategoriesLoaded");k.log("selectCategory
event
thrown",2);k.element.trigger("selectCategory",a("#"+l.dialogId).find("."+l.categoryClass+">li:first"))})});return
k};a.fn.dashboard.defaults={debuglevel:3,json_data:{},fullscreenHeaderInner:'<img
alt="Close this widget" src="images/close.gif" /> Return to
Dashboard',loadingHtml:'<div class="loading"><img alt="Loading, please wait"
src="../themes/default/loading.gif"
/><p>Loading...</p></div>',emptyColumnHtml:"Drag your widgets
here",tempDashboard:"tempDashboard",widgetTemplate:"widgettemplate",columnPrefix:"column-",opacity:"0.2",deleteConfirmMessage:"Are
you sure you want to delete this widget?",saveFailedMessage:"Saving failed.
Please reload the page.",widgetNotFoundMessage:"The content of this widget is
not available anymore. You may remove this
widget.",columnClass:"column",widgetClass:"widget",menuClass:"controls",widgetContentClass:"widgetcontent",widgetTitleClass:"widgettitle",widgetHeaderClass:"widgetheader",iconsClass:"icons",addWidgetSettings:{openDialogClass:"openaddwidgetdialog",addWidgetClass:"addwidget",selectCategoryClass:"selectcategory",selectedCategoryClass:"selected",categoryClass:"categories",widgetClass:"widgets",dialogId:"addwidgetdialog",categoryTemplate:"categorytemplate",widgetTemplate:"addwidgettemplate"},editLayoutSettings:{dialogId:"editLayout",layoutClass:"layoutselection",selectLayoutClass:"layoutchoice",selectedLayoutClass:"selected",editLayoutClass:"editlayout",layoutTemplate:"selectlayouttemplate"}};a.fn.dashboard.widget={defaults:{open:true,fullscreen:false,loaded:false,url:"",metadata:{}}}})(jQuery);(function(){var
b={};this.tmpl=function a(e,d){var
c=!/\W/.test(e)?b[e]=b[e]||a(document.getEle!
mentById
(e).innerHTML):new Function("obj","var
p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+e.replace(/[\r\t\n]/g,"
").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return
p.join('');");return d?c(d):c}})();
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Fri Dec 17 14:44:25 2010
@@ -616,7 +616,7 @@
}
gadget.put("id", gadgetUrl);
- gadget.put("url", gadgetUrl);
+ gadget.put("url", "");
gadget.put("metadata", new JSONObject().put("gadgeturl",
gadgetUrl));
return gadget;
