You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/16 21:51:22 UTC
[1/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Updated Branches:
refs/heads/ui-granular-settings 202930fd5 -> b54f643b9
Add granular settings widget
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1bb0136c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1bb0136c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1bb0136c
Branch: refs/heads/ui-granular-settings
Commit: 1bb0136c8e9575e7113cd38d44effbc02a8127e3
Parents: 202930f
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:41:04 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:41:04 2013 -0700
----------------------------------------------------------------------
ui/index.jsp | 1 +
ui/scripts/ui-custom/granularSettings.js | 46 +++++++++++++++++++++++++
2 files changed, 47 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1bb0136c/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 46f49f0..ce1183d 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1647,6 +1647,7 @@ under the License.
<script type="text/javascript" src="scripts/ui-custom/autoscaler.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/healthCheck.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/autoscaler.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/granularSettings.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/zoneChart.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/dashboard.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/installWizard.js?t=<%=now%>"></script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1bb0136c/ui/scripts/ui-custom/granularSettings.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/granularSettings.js b/ui/scripts/ui-custom/granularSettings.js
new file mode 100644
index 0000000..02d5c1f
--- /dev/null
+++ b/ui/scripts/ui-custom/granularSettings.js
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+ cloudStack.uiCustom.granularSettings = function(args) {
+ var dataProvider = args.dataProvider;
+ var actions = args.actions;
+
+ return function(args) {
+ var context = args.context;
+
+ var listView = {
+ id: 'settings',
+ fields: {
+ name: { label: 'label.name' },
+ value: { label: 'label.value', editable: true }
+ },
+ actions: {
+ edit: {
+ label: 'label.change.value',
+ action: actions.edit
+ }
+ },
+ dataProvider: dataProvider
+ };
+
+ var $listView = $('<div>').listView({ context: context, listView: listView });
+
+ return $listView;
+ }
+ };
+}(jQuery, cloudStack));
[2/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Add zone-level granular settings UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/019e8cd0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/019e8cd0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/019e8cd0
Branch: refs/heads/ui-granular-settings
Commit: 019e8cd0ff8fe45d0e867a42e9643c8b571c1725
Parents: 1bb0136
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:41:20 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:41:20 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/019e8cd0/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a905412..11ae1f2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5381,6 +5381,28 @@
}
}
}
+ },
+
+ // Granular settings for zone
+ settings: {
+ title: 'label.menu.global.settings',
+ custom: cloudStack.uiCustom.granularSettings({
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { name: 'config.param.1', value: 1 },
+ { name: 'config.param.2', value: 2 }
+ ]
+ });
+ },
+ actions: {
+ edit: function(args) {
+ debugger;
+ // call updateZoneLevelParamter
+ args.response.success();
+ }
+ }
+ })
}
}
}
[4/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Add primary storage-level parameters UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8295dd4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8295dd4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8295dd4
Branch: refs/heads/ui-granular-settings
Commit: e8295dd4b0fe40134824a1c971aae63579505e44
Parents: 59d0541
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:46:44 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:46:44 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8295dd4/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 2a18eed..46dd604 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10439,6 +10439,27 @@
}
});
}
+ },
+
+ // Granular settings for storage pool
+ settings: {
+ title: 'label.menu.global.settings',
+ custom: cloudStack.uiCustom.granularSettings({
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { name: 'config.param.1', value: 1 },
+ { name: 'config.param.2', value: 2 }
+ ]
+ });
+ },
+ actions: {
+ edit: function(args) {
+ // call updateStorageLevelParameters
+ args.response.success();
+ }
+ }
+ })
}
}
}
[3/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Add cluster-level parameters
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59d0541b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59d0541b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59d0541b
Branch: refs/heads/ui-granular-settings
Commit: 59d0541bac54b805dc80ef575dea097d8314a849
Parents: 019e8cd
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:46:23 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:46:23 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59d0541b/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 11ae1f2..2a18eed 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5397,7 +5397,6 @@
},
actions: {
edit: function(args) {
- debugger;
// call updateZoneLevelParamter
args.response.success();
}
@@ -8800,6 +8799,27 @@
});
}
}
+ },
+
+ // Granular settings for cluster
+ settings: {
+ title: 'label.menu.global.settings',
+ custom: cloudStack.uiCustom.granularSettings({
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { name: 'config.param.1', value: 1 },
+ { name: 'config.param.2', value: 2 }
+ ]
+ });
+ },
+ actions: {
+ edit: function(args) {
+ // call updateClusterLevelParameters
+ args.response.success();
+ }
+ }
+ })
}
}
}
[5/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Add seondary storage-level parameters UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9130cd04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9130cd04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9130cd04
Branch: refs/heads/ui-granular-settings
Commit: 9130cd04995a0262bde5347c5a7f750fa33615ba
Parents: e8295dd
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:46:58 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:46:58 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9130cd04/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 46dd604..23822b2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10653,6 +10653,27 @@
}
});
}
+ },
+
+ // Granular settings for storage pool
+ settings: {
+ title: 'label.menu.global.settings',
+ custom: cloudStack.uiCustom.granularSettings({
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { name: 'config.param.1', value: 1 },
+ { name: 'config.param.2', value: 2 }
+ ]
+ });
+ },
+ actions: {
+ edit: function(args) {
+ // call updateStorageLevelParameters
+ args.response.success();
+ }
+ }
+ })
}
}
}
[7/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Always maximize detail views with settings tab (to fit listView layout)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b54f643b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b54f643b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b54f643b
Branch: refs/heads/ui-granular-settings
Commit: b54f643b91a144e5f67dd21e8d49e8ee8f7a69a5
Parents: ad38060
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:51:07 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:51:07 2013 -0700
----------------------------------------------------------------------
ui/scripts/accounts.js | 1 +
ui/scripts/system.js | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b54f643b/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index e663db8..cea748d 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -277,6 +277,7 @@
detailView: {
name: 'Account details',
+ isMaximized: true,
viewAll: { path: 'accounts.users', label: 'label.users' },
actions: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b54f643b/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 23822b2..d44a694 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10255,6 +10255,7 @@
detailView: {
name: "Primary storage details",
+ isMaximized: true,
actions: {
edit: {
label: 'label.edit',
@@ -10598,6 +10599,7 @@
detailView: {
name: 'Secondary storage details',
+ isMaximized: true,
actions: {
remove: {
label: 'label.action.delete.secondary.storage' ,
[6/7] git commit: updated refs/heads/ui-granular-settings to b54f643
Posted by bf...@apache.org.
Add account-level parameter UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad38060e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad38060e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad38060e
Branch: refs/heads/ui-granular-settings
Commit: ad38060e3a9fd45dda7de4fd10450b116db2283a
Parents: 9130cd0
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 12:47:08 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 12:47:08 2013 -0700
----------------------------------------------------------------------
ui/scripts/accounts.js | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad38060e/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 8353d70..e663db8 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -895,6 +895,27 @@
}
});
}
+ },
+
+ // Granular settings for account
+ settings: {
+ title: 'label.menu.global.settings',
+ custom: cloudStack.uiCustom.granularSettings({
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { name: 'config.param.1', value: 1 },
+ { name: 'config.param.2', value: 2 }
+ ]
+ });
+ },
+ actions: {
+ edit: function(args) {
+ // call updateAccountLevelParameters
+ args.response.success();
+ }
+ }
+ })
}
}
}