svn commit: r1396709 - in /rave/trunk/rave-portal-resources/src/main/webapp/static: css/rave-css.less script/rave.js

[klegacy]

Author: klegacy
Date: Wed Oct 10 17:54:27 2012
New Revision: 1396709

URL: http://svn.apache.org/viewvc?rev=1396709&view=rev
Log:
Applying RAVE-790.patch - adding close button to open view dialog and 
modal_dialog.

Modified:
    rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
    rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js

Modified: 
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1396709&r1=1396708&r2=1396709&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less 
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less 
Wed Oct 10 17:54:27 2012
@@ -1143,6 +1143,13 @@ span.error, label.error {
 }
 
 /* popups */
+.popup.dialog,
+.popup.modal_dialog{
+       & > .close{
+               margin-right: 4px;
+       }
+}
+
 .popup.slideout {
     box-sizing: border-box;
     position: fixed;

Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1396709&r1=1396708&r2=1396709&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js 
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Wed 
Oct 10 17:54:27 2012
@@ -115,7 +115,7 @@ var rave = rave || (function () {
                 name:"dialog",
                 containerSelector:'.popup.dialog',
                 contentSelector:'.modal-body',
-                markup:'<div class="popup dialog modal fade"><div 
class="modal-body"></div></div>',
+                markup:'<div class="popup dialog modal fade"><a href="#" 
class="close" data-dismiss="modal">&times;</a><div 
class="modal-body"></div></div>',
                 initialize:function (container) {
                     container.find(this.contentSelector).data('popupType', 
this.name);
                     var cfg = {
@@ -137,7 +137,7 @@ var rave = rave || (function () {
                 name:"modal_dialog",
                 containerSelector:'.popup.modal_dialog',
                 contentSelector:'.modal-body',
-                markup:'<div class="popup modal_dialog modal fade"><div 
class="modal-body"></div></div>',
+                markup:'<div class="popup modal_dialog modal fade"><a href="#" 
class="close" data-dismiss="modal">&times;</a><div 
class="modal-body"></div></div>',
                 initialize:function (container) {
                     container.find(this.contentSelector).data('popupType', 
this.name);
                     var cfg = {