Author: olamy
Date: Sat Dec 29 23:58:34 2012
New Revision: 1426860
URL: http://svn.apache.org/viewvc?rev=1426860&view=rev
Log:
move network configuration screen to a new screen with tabs
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1426860&r1=1426859&r2=1426860&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
Sat Dec 29 23:58:34 2012
@@ -551,16 +551,17 @@ define("archiva.general-admin",["jquery"
}
}
- displayNetworkConfiguration=function(){
+ displayRuntimeConfiguration=function(){
screenChange();
var mainContent=$("#main-content");
- mainContent.html(mediumSpinnerImg());
+
+ mainContent.html($("#runtime-configuration-screen").tmpl());
$.ajax("restServices/archivaServices/archivaAdministrationService/getNetworkConfiguration",
{
type: "GET",
dataType: 'json',
success: function(data){
- mainContent.html($("#network-configuration-screen").tmpl());
+
var networkConfiguration=new
NetworkConfiguration(data.maxTotal,data.maxTotalPerHost,data.usePooling);
var networkConfigurationViewModel=new
NetworkConfigurationViewModel(networkConfiguration);
ko.applyBindings(networkConfigurationViewModel,mainContent.get(0));
@@ -1538,7 +1539,7 @@ define("archiva.general-admin",["jquery"
});
}
- displayRuntimeConfiguration=function(){
+ displayRedbackRuntimeConfiguration=function(){
$.log("displayRuntimeConfiguration");
var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1426860&r1=1426859&r2=1426860&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Sat Dec 29 23:58:34 2012
@@ -227,7 +227,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
{ text : $.i18n.prop('menu.network-proxies') , id:
"menu-network-proxies-list-a" , href: "#networkproxies" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayNetworkProxies()}},
{ text : $.i18n.prop('menu.legacy-artifact-support') , id:
"menu-legacy-support-list-a" , href: "#legacy" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayLegacyArtifactPathSupport()}},
{ text : $.i18n.prop('menu.repository-scanning') , id:
"menu-repository-scanning-list-a" , href: "#scanningList" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayRepositoryScanning()}},
- { text : $.i18n.prop('menu.network-configuration') , id:
"menu-network-configuration-list-a" , href: "#network" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayNetworkConfiguration()}},
+ { text : $.i18n.prop('menu.runtime-configuration') , id:
"menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayRuntimeConfiguration()}},
{ text : $.i18n.prop('menu.system-status') , id:
"menu-system-status-list-a" , href: "#status" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displaySystemStatus()}},
{ text : $.i18n.prop('menu.ui-configuration') , id:
"menu-ui-configuration-list-a" , href: "#uiconfig" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayUiConfiguration()}},
{ text : $.i18n.prop('menu.reports') , id:
"menu-report-list-a" , href: "#reports" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayReportsPage()}}
@@ -237,7 +237,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
{ text : $.i18n.prop('menu.users') , id: null},
{ text : $.i18n.prop('menu.users.manage') , id:
"menu-users-list-a" , href: "#users" , redback:
"{permissions: ['archiva-manage-users']}", func:
function(){displayUsersGrid()}},
{ text : $.i18n.prop('menu.users.roles') , id:
"menu-roles-list-a" , href: "#roles" , redback:
"{permissions: ['archiva-manage-users']}", func:
function(){displayRolesGrid()}},
- { text : $.i18n.prop('menu.runtime-configuration') , id:
"menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback:
"{permissions: ['archiva-manage-configuration']}", func:
function(){displayRuntimeConfiguration()}}
+ { text : $.i18n.prop('menu.users-runtime-configuration') , id:
"menu-redback-runtime-configuration-list-a" , href: "#redbackruntimeconfig" ,
redback: "{permissions: ['archiva-manage-configuration']}", func:
function(){displayRedbackRuntimeConfiguration()}}
]);
this.docsMenuItems = ko.observableArray([
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1426860&r1=1426859&r2=1426860&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
Sat Dec 29 23:58:34 2012
@@ -280,13 +280,23 @@
</table>
</script>
-<script id="network-configuration-screen" type="text/html">
- <div class="page-header">
- <h4>${$.i18n.prop('network-configuration.header')}</h4>
+<script id="runtime-configuration-screen" type="text/html">
+ <ul class="nav nav-tabs">
+ <li class="active" id="network-configuration-form-li"><a
href="#network-configuration-form-content"
data-toggle="tab">${$.i18n.prop('runtime-configuration.maven.network.title')}</a></li>
+
+ </ul>
+
+ <div class="tab-content">
+ <div class="tab-pane active" id="network-configuration-form-content">
+ <div class="page-header">
+ <h4>${$.i18n.prop('network-configuration.header')}</h4>
+ </div>
+ <div id="network-configuration-form" data-bind='template:
{name:"network-configuration-form-tmpl"}'></div>
+ </div>
</div>
- <div id="network-configuration-form" data-bind='template:
{name:"network-configuration-form-tmpl"}'></div>
</script>
+
<script id="network-configuration-form-tmpl" type="text/html">
<form id="network-configuration-edit-form" class="well form-horizontal">
<fieldset id="network-configuration-edit-fieldset">
