Author: erinnp
Date: Fri Sep 6 15:44:12 2013
New Revision: 1520608
URL: http://svn.apache.org/r1520608
Log:
Adding view surfaces, refining register view directive
Added:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/canvas.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/home.html
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-css.less
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/portal.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/directives/RegisterView.js
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1520608&r1=1520607&r2=1520608&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-css.less
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-css.less
Fri Sep 6 15:44:12 2013
@@ -145,7 +145,7 @@ width: 90%;*/
}
.widget-wrapper-canvas {
position: absolute;
- z-index: 999;
+ z-index: 2000;
left: 1.25%;
top: 50px;
width: 97.5%;
Added:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/canvas.html
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/canvas.html?rev=1520608&view=auto
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/canvas.html
(added)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/canvas.html
Fri Sep 6 15:44:12 2013
@@ -0,0 +1,16 @@
+<div class="modal-backdrop fade in"></div>
+<div class="widget-wrapper-canvas">
+ <div class="widget-title-bar widget-title-bar-draggable">
+ <div class="widget-title">
+ {{regionWidget.widgetUrl}}
+ </div>
+ <div class="widget-toolbar ">
+ <span class="widget-toolbar-btn" ng-click="minimize()">
+ <i class="icon-resize-small"></i>
+ </span>
+ </div>
+ </div>
+ <div class="widget">
+ <div render-iframe="regionWidget"></div>
+ </div>
+</div>
\ No newline at end of file
Added:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/home.html
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/home.html?rev=1520608&view=auto
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/home.html
(added)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/surfaces/home.html
Fri Sep 6 15:44:12 2013
@@ -0,0 +1,93 @@
+<div class="widget-title-bar widget-title-bar-draggable" >
+ <div class="widget-toolbar-toggle-collapse" title="Collapse/Restore
Widget">
+ <i ng-class="{'icon-chevron-down':!regionWidget.collapsed,
'icon-chevron-up':regionWidget.collapsed}"
+ ng-click="toggleCollapse()"></i>
+ </div>
+ <div class="widget-title">
+ {{regionWidget.widgetUrl}}
+ </div>
+ <div class="widget-toolbar ">
+ <div class="dropdown widget-menu-wrapper" style="">
+ <a class="dropdown-toggle" data-toggle="dropdown">
+ <i class="icon-cog"></i>
+ </a>
+ <ul class="dropdown-menu widget-menu">
+ <li ng-class="{'menu-item-disabled':menu.editPrefs.disable}">
+ <a ng-click="togglePrefs()">
+ Edit Preferences
+ </a>
+ </li>
+ <li>
+ <a ng-click="maximize()">
+ Maximize
+ </a>
+ </li>
+ <li ng-class="{'menu-item-disabled':menu.move.disable}">
+ <a ng-click="moveToPage()">
+ Move to Page
+ </a>
+ </li>
+ <li>
+ <a ng-click="delete()">
+ Delete Widget
+ </a>
+ </li>
+ <li class="divider"></li>
+ <li>
+ <a>
+ About this Widget
+ </a>
+ </li>
+ <li>
+ <a>
+ Comment on this Widget
+ </a>
+ </li>
+ <li>
+ <a>
+ Rate this Widget
+ </a>
+ </li>
+ </ul>
+ </div>
+<span class="widget-toolbar-btn widget-toolbar-btn-min">
+<i class="icon-resize-small"></i>
+</span>
+ </div>
+</div>
+
+<div class="widget-prefs" ng-show="showPrefs">
+ <form class="form-horizontal" ng-submit="savePrefs()">
+ <div class="control-group" ng-repeat="pref in regionWidgetPrefs"
ng-hide="pref.dataType=='HIDDEN'">
+ <label class="control-label"
+
for="{{regionWidget.id}}-{{pref.name}}">{{pref.displayName}}</label>
+
+ <div class="controls" ng-switch="pref.dataType">
+ <div ng-switch-when="STRING">
+ <input type="text" id="{{regionWidget.id}}-{{pref.name}}"
ng-model="pref.value">
+ </div>
+ <div ng-switch-when="BOOL">
+ <input type="checkbox"
id="{{regionWidget.id}}-{{pref.name}}" ng-model="pref.value">
+ </div>
+ <div ng-switch-when="ENUM">
+ <select id="{{regionWidget.id}}-{{pref.name}}"
ng-model="pref.value"
+ ng-options="o.value as o.displayValue for o in
pref.orderedEnumValues"></select>
+ </div>
+ <div ng-switch-when="LIST">
+ <textarea type="text"
id="{{regionWidget.id}}-{{pref.name}}" ng-model="pref.value">
+ </textarea>
+ </div>
+ <div ng-switch-when="hidden">
+ <input type="hidden" ng-model="pref.value">
+ </div>
+ </div>
+ </div>
+ <div class="form-actions">
+ <button type="button" ng-click="togglePrefs()"
class="btn">Cancel</button>
+ <button type="submit" class="btn btn-primary">Save changes</button>
+ </div>
+ </form>
+</div>
+<div class="widget" ng-hide="regionWidget.collapsed">
+ <div render-iframe="regionWidget"></div>
+</div>
\ No newline at end of file
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/portal.html
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/portal.html?rev=1520608&r1=1520607&r2=1520608&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/portal.html
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/portal.html
Fri Sep 6 15:44:12 2013
@@ -4,98 +4,5 @@
<div ng-include="hostedPath+'/static/html/portal/tabs.html'"></div>
</div>
-<div class="widget-wrapper" register-view="home">
- <div class="widget-title-bar widget-title-bar-draggable"
ng-controller="WidgetController">
- <div class="widget-toolbar-toggle-collapse" title="Collapse/Restore
Widget">
- <i ng-class="{'icon-chevron-down':!regionWidget.collapsed,
'icon-chevron-up':regionWidget.collapsed}"
- ng-click="toggleCollapse()"></i>
- </div>
- <div class="widget-title">
- {{regionWidget.widgetUrl}}
- </div>
- <div class="widget-toolbar ">
- <div class="dropdown widget-menu-wrapper" style="">
- <a class="dropdown-toggle" data-toggle="dropdown">
- <i class="icon-cog"></i>
- </a>
- <ul class="dropdown-menu widget-menu">
- <li
ng-class="{'menu-item-disabled':menu.editPrefs.disable}">
- <a ng-click="togglePrefs()">
- Edit Preferences
- </a>
- </li>
- <li>
- <a ng-click="maximize()">
- Maximize
- </a>
- </li>
- <li ng-class="{'menu-item-disabled':menu.move.disable}">
- <a ng-click="moveToPage()">
- Move to Page
- </a>
- </li>
- <li>
- <a ng-click="delete()">
- Delete Widget
- </a>
- </li>
- <li class="divider"></li>
- <li>
- <a>
- About this Widget
- </a>
- </li>
- <li>
- <a>
- Comment on this Widget
- </a>
- </li>
- <li>
- <a>
- Rate this Widget
- </a>
- </li>
- </ul>
- </div>
-<span class="widget-toolbar-btn widget-toolbar-btn-min">
-<i class="icon-resize-small"></i>
-</span>
- </div>
- </div>
-
- <div class="widget-prefs" ng-show="showPrefs">
- <form class="form-horizontal" ng-submit="savePrefs()">
- <div class="control-group" ng-repeat="pref in regionWidgetPrefs"
ng-hide="pref.dataType=='HIDDEN'">
- <label class="control-label"
-
for="{{regionWidget.id}}-{{pref.name}}">{{pref.displayName}}</label>
-
- <div class="controls" ng-switch="pref.dataType">
- <div ng-switch-when="STRING">
- <input type="text"
id="{{regionWidget.id}}-{{pref.name}}" ng-model="pref.value">
- </div>
- <div ng-switch-when="BOOL">
- <input type="checkbox"
id="{{regionWidget.id}}-{{pref.name}}" ng-model="pref.value">
- </div>
- <div ng-switch-when="ENUM">
- <select id="{{regionWidget.id}}-{{pref.name}}"
ng-model="pref.value"
- ng-options="o.value as o.displayValue for o in
pref.orderedEnumValues"></select>
- </div>
- <div ng-switch-when="LIST">
- <textarea type="text"
id="{{regionWidget.id}}-{{pref.name}}" ng-model="pref.value">
- </textarea>
- </div>
- <div ng-switch-when="hidden">
- <input type="hidden" ng-model="pref.value">
- </div>
- </div>
- </div>
- <div class="form-actions">
- <button type="button" ng-click="togglePrefs()"
class="btn">Cancel</button>
- <button type="submit" class="btn btn-primary">Save
changes</button>
- </div>
- </form>
- </div>
- <div class="widget" ng-hide="regionWidget.collapsed">
- <div render-iframe="regionWidget"></div>
- </div>
-</div>
\ No newline at end of file
+<register-view view="canvas"
template="hostedPath+'/static/html/common/surfaces/canvas.html'"></register-view>
+<register-view view="home"
template="hostedPath+'/static/html/common/surfaces/home.html'"></register-view>
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/directives/RegisterView.js
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/directives/RegisterView.js?rev=1520608&r1=1520607&r2=1520608&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/directives/RegisterView.js
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/directives/RegisterView.js
Fri Sep 6 15:44:12 2013
@@ -17,8 +17,9 @@
* under the License.
*/
-define(['rave'], function(rave){
- return [function () {
+define(['rave'], function (rave) {
+ return ['$http',
+ function ($http) {
var directive = {
restrict: 'AE',
scope: {},
@@ -34,12 +35,23 @@ define(['rave'], function(rave){
],
link: function (scope, el, attrs, controller) {
- var viewName = attrs.registerView;
+ var viewName = attrs.registerView || attrs.view;
+ //Because this directive has an isolate scope, need to
eval expressions with the parent scope
+ var template = scope.$parent.$eval(attrs.template);
- var template = el.html();
+ if (template) {
+ $http.get(template).success(function (data) {
+ template = data;
+ rave.registerView(viewName, template);
+ });
+ } else {
+ template = el.html();
+ rave.registerView(viewName, template);
+
+ }
el.remove();
- rave.registerView(viewName, template);
+
}
}
