Author: [email protected]
Date: Tue Jan 24 13:46:52 2012
New Revision: 1985
Log:
[AMDATUOPENSOCIAL-187] Fixed by using jQuery buttons instead such that the
buttons take over the selected theme
Modified:
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/demo/templates.html
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/html/templates.html
Modified:
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/demo/templates.html
==============================================================================
---
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/demo/templates.html
(original)
+++
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/demo/templates.html
Tue Jan 24 13:46:52 2012
@@ -53,7 +53,7 @@
<li class="widgetitem">
<img src="<%= image %>" alt="" height="60" width="120">
<div class="add-button">
- <input class="macro-button-add addwidget" id="addwidget<%= id %>"
value="Add it Now" type="button"><br>
+ <button class="addwidget" id="addwidget<%= id %>">Add it
Now</button><br>
<input class="macro-hidden-uri" value="<%= url %>" type="hidden">
</div>
<!-- // .add-button -->
Modified:
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
(original)
+++
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
Tue Jan 24 13:46:52 2012
@@ -864,12 +864,15 @@
db.widgetsToAdd[item.id] = item;
db.log('Applying template : ' + addOpts.widgetTemplate,1);
+
if ($('#' + addOpts.widgetTemplate).length == 0) db.log('Template
"' + addOpts.widgetTemplate + ' not found',5);
var html = tmpl($('#' + addOpts.widgetTemplate).html(), item);
$('#' + addOpts.dialogId).find('.' +
addOpts.widgetClass).append(html);
});
+ $("button").button();
+
db.log('addWidgetDialogWidgetsLoaded event thrown',2);
db.element.trigger('addWidgetDialogWidgetsLoaded');
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/html/templates.html
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/html/templates.html
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/html/templates.html
Tue Jan 24 13:46:52 2012
@@ -68,13 +68,13 @@
<br clear="all"/>
<div class="add-button">
- <input class="macro-button-add addwidget" id="addwidget<%= id %>"
value="Add to dashboard" type="button"><br>
+ <button class="addwidget" id="addwidget<%= id %>">Add to
dashboard</button><br>
<input class="macro-hidden-uri" value="<%= url %>" type="hidden">
</div>
<%if(removeAccessGranted == 'true') { %>
<div class="remove-button">
- <input class="macro-button-remove removegadget" id="removegadget<%= id
%>" value="Remove from store" type="button">
+ <button class="removegadget" id="removegadget<%= id %>">Remove from
store</button>
<input class="macro-hidden-uri" value="<%= url %>" type="hidden">
</div>
<% } %>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
