Merge "Refactor resmanager code"
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/License.txt
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/conf/License.txt
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/globalconfig.json b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/globalconfig.json
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/conf/globalconfig.json
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/globalconfig.json
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/RMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/RMain.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/RMain.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/RMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/VMMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/VMMain.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/VMMain.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/VMMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap-table.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap-table.min.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap-table.min.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap-table.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap.min.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap.min.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/jquery.dataTables.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/jquery.dataTables.min.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/jquery.dataTables.min.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/jquery.dataTables.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/resmgr.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/resmgr.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/css/resmgr.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/resmgr.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/datacenter.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/datacenter.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/datacenter.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/datacenter.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/html/index.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/html/index.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/html/index.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/html/index.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/License.txt
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/License.txt
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/add.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/add.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/add.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/add.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/arrow-down-enable.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/arrow-down-enable.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/arrow-down-enable.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/arrow-down-enable.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/collapse_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/collapse_arrow.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/collapse_arrow.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/collapse_arrow.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/delete.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/delete.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/delete.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/delete.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/edit.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/edit.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/edit.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/edit.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/expand_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/expand_arrow.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/expand_arrow.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/expand_arrow.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/ideo_default_select.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/ideo_default_select.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/ideo_default_select.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/ideo_default_select.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/import.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/import.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/import.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/import.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/line.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/line.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/line.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/line.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/loading-spinner-grey.gif b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/loading-spinner-grey.gif
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/loading-spinner-grey.gif
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/loading-spinner-grey.gif
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/openo.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/openo.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/openo.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/openo.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_l.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_l.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_l.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_l.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_left_disabled.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_left_disabled.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_left_disabled.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_left_disabled.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_r.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_r.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_r.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_r.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_asc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_asc.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_asc.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_asc.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_both.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_both.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_both.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_both.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_desc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_desc.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_desc.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_desc.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/SendMsg.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/SendMsg.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/SendMsg.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/SendMsg.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootbox.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootbox.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootbox.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootbox.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap-table.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap-table.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap-table.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap-table.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/chart.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/chart.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/chart.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/chart.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/datacenter.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/datacenter.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/datacenter.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/datacenter.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/gconf.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/gconf.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/gconf.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/gconf.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery-1.11.2.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery-1.11.2.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery-1.11.2.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery-1.11.2.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.dataTables.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.dataTables.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.dataTables.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.dataTables.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.validate.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.validate.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.validate.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.validate.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/resmgr.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/resmgr.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/resmgr.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/resmgr.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/validateset.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/validateset.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/validateset.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/validateset.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/vim.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/vim.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/js/vim.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/vim.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/location.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/location.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/location.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/location.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/resource.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/resource.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/resource.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/resource.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/vim.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/vim.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-nfv/vim.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/vim.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn.rar b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn.rar
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn.rar
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn.rar
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/License.txt
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/conf/License.txt
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/dataconfig.json b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/dataconfig.json
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/conf/dataconfig.json
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/dataconfig.json
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/RMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/RMain.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/css/RMain.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/RMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/VMMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/VMMain.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/css/VMMain.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/VMMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap-table.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap-table.min.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap-table.min.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap-table.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap.min.css
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap.min.css
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/License.txt
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/License.txt
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/add.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/add.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/add.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/add.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/arrow-down-enable.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/arrow-down-enable.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/arrow-down-enable.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/arrow-down-enable.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/collapse_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/collapse_arrow.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/collapse_arrow.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/collapse_arrow.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/delete.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/delete.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/delete.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/delete.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/edit.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/edit.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/edit.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/edit.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/expand_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/expand_arrow.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/expand_arrow.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/expand_arrow.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/ideo_default_select.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/ideo_default_select.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/ideo_default_select.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/ideo_default_select.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/import.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/import.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/import.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/import.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/line.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/line.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/line.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/line.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/loading-spinner-grey.gif b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/loading-spinner-grey.gif
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/loading-spinner-grey.gif
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/loading-spinner-grey.gif
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/openo.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/openo.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/openo.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/openo.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_l.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_l.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_l.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_l.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_left_disabled.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_left_disabled.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_left_disabled.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_left_disabled.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_r.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_r.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_r.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_r.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_asc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_asc.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_asc.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_asc.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_both.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_both.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_both.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_both.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_desc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_desc.png
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_desc.png
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_desc.png
Binary files differ
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/brs.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/brs.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/js/brs.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/brs.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/jquery-1.11.2.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/jquery-1.11.2.min.js
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/js/jquery-1.11.2.min.js
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/jquery-1.11.2.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/link.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/link.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/link.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/link.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/ne.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/ne.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/ne.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/ne.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/port.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/port.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/port.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/port.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/resource.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/resource.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/resource.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/resource.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/site.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/site.html
similarity index 100%
rename from resmgr/src/main/webapp/bak/resmgr-sdn/site.html
rename to resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/site.html
diff --git a/resmgr/src/main/webapp/index.html b/resmgr/src/main/webapp/resmgr/index.html
similarity index 97%
rename from resmgr/src/main/webapp/index.html
rename to resmgr/src/main/webapp/resmgr/index.html
index a715202..9a2300f 100644
--- a/resmgr/src/main/webapp/index.html
+++ b/resmgr/src/main/webapp/resmgr/index.html
@@ -26,7 +26,7 @@
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
<link href="thirdparty/css/magic-check.css" rel="stylesheet"/>
<link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css">
- <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
+ <!--<link href="framework/css/open-ostyle.css" rel="stylesheet"/>-->
<!--<link rel="stylesheet" href="framework/css/RMain.css">
<link rel="stylesheet" href="framework/css/VMMain.css">-->
<link href="framework/css/open-ostyle.css" rel="stylesheet"/>
diff --git a/resmgr/src/main/webapp/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
similarity index 89%
rename from resmgr/src/main/webapp/js/app.js
rename to resmgr/src/main/webapp/resmgr/js/app.js
index 6c2ef29..149739a 100644
--- a/resmgr/src/main/webapp/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -139,41 +139,49 @@
var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();
- var portName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};
+ var portName = {"ErrMsg" : {"errmsg" : "Name is required.", "modalVar":"port.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};
$('#myModal #name').append($compile(Mustache.to_html(text, portName.ErrMsg))($scope));
- var portMe = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.me", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};
+ var portMe = {"ErrMsg" : {"errmsg" : "ME is required.", "modalVar":"port.me", "errtag":"textboxErrMe", "errfunc":"validatetextboxMe", "required":true}};
$('#myModal #me').append($compile(Mustache.to_html(text, portMe.ErrMsg))($scope));
//var portType = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"port.type"}};
$('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdowntypeData))($scope));
- var portLayerRate = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"port.layerrate"}};
+ var portLayerRate = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.layerrate"}};
$('#myModal #layerrate').append($compile(Mustache.to_html(text, portLayerRate.ErrMsg))($scope));
//var portEdgePoint = {"ErrMsg" : {"ipv4Err" : "IP Address is required.", "modalVar":"port.Edgepoint"}};
$('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownEdgeData))($scope));
- var portIndex = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"port.portindex"}};
+ var portIndex = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.portindex"}};
$('#myModal #portindex').append($compile(Mustache.to_html(text, portIndex.ErrMsg))($scope));
- var portIp = {"ErrMsg" : {"textboxErr" : "The ip is required.", "modalVar":"port.ipaddress"}};
+ var portIp = {"ErrMsg" : {"errmsg" : "The ip is required.", "modalVar":"port.ipaddress"}};
$('#myModal #ipaddress').append($compile(Mustache.to_html(text, portIp.ErrMsg))($scope));
- var portAdmin = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"port.adminState"}};
+ var portAdmin = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.adminState"}};
$('#myModal #adminState').append($compile(Mustache.to_html(text, portAdmin.ErrMsg))($scope));
- var portOperatingState = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"port.operatingState"}};
+ var portOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.operatingState"}};
$('#myModal #operatingState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxName = function (value){
if($scope.port.name) {
- $scope.textboxErr = false;
+ $scope.textboxErrName = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrName = true;
+ }
+
+ $scope.validatetextboxMe = function (value){
+ if($scope.port.me) {
+ $scope.textboxErrMe = false;
+ }
+ else
+ $scope.textboxErrMe = true;
}
$scope.validateipv4 = function (value){
@@ -219,7 +227,8 @@
$scope.port = {};
//$("#myModal").modal();
$("#myModal").modal({}).draggable();
- $scope.textboxErr = false;
+ $scope.textboxErrName = false;
+ $scope.textboxErrMe = false;
$scope.ipv4Err = false;
$scope.numericErr = false;
}
@@ -367,29 +376,29 @@
var text = $(modelTemplate).filter('#textfield').html();
var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();
- var siteName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"site.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};
+ var siteName = {"ErrMsg" : {"errmsg" : "Name is required.", "modalVar":"site.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};
$('#myModal #name').append($compile(Mustache.to_html(text, siteName.ErrMsg))($scope));
$('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownsiteData))($scope));
- var siteTenantName = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"site.tenatname"}};
+ var siteTenantName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"site.tenatname"}};
$('#myModal #tenantname').append($compile(Mustache.to_html(text, siteTenantName.ErrMsg))($scope));
- var siteTenantType = {"ErrMsg" : {"textboxErr" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};
+ var siteTenantType = {"ErrMsg" : {"errmsg" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};
$('#myModal #tenanttype').append($compile(Mustache.to_html(text, siteTenantType.ErrMsg))($scope));
- var siteLocation = {"ErrMsg" : {"textboxErr" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};
+ var siteLocation = {"ErrMsg" : {"errmsg" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};
$('#myModal #location').append($compile(Mustache.to_html(text, siteLocation.ErrMsg))($scope));
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxName = function (value){
if($scope.site.name) {
- $scope.textboxErr = false;
+ $scope.textboxErrName = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrName = true;
}
@@ -409,7 +418,7 @@
$scope.site = {};
//$("#myModal").modal();
$("#myModal").modal({}).draggable();
- $scope.textboxErr = false;
+ $scope.textboxErrName = false;
}
$scope.saveData = function(id) {
if(id) {
@@ -558,82 +567,57 @@
var ipv4 = $(modelTemplate).filter('#ipv4').html();
var number = $(modelTemplate).filter('#numeric').html();
- var locId = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"loc.Id", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country", "placeholder":"Id"}};
+ var locId = {"ErrMsg" : {"errmsg" : "Name is required.", "modalVar":"loc.Id", "errtag":"textboxErrId", "errfunc":"validatetextboxId", "placeholder":"Country", "placeholder":"Id"}};
$('#myModal #Name').append($compile(Mustache.to_html(text, locId.ErrMsg))($scope));
- var locCountry = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"loc.Country", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country","required":true}};
+ var locCountry = {"ErrMsg" : {"errmsg" : "Country is required.", "modalVar":"loc.Country", "errtag":"textboxErrCountry", "errfunc":"validatetextboxCountry", "placeholder":"Country","required":true}};
$('#myModal #Country').append($compile(Mustache.to_html(text, locCountry.ErrMsg))($scope));
- var locLocation = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"loc.Location", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Location","required":true}};
+ var locLocation = {"ErrMsg" : {"errmsg" : "Location is required.", "modalVar":"loc.Location", "errtag":"textboxErrLocation", "errfunc":"validatetextboxLocation", "placeholder":"Location","required":true}};
$('#myModal #Location').append($compile(Mustache.to_html(text, locLocation.ErrMsg))($scope));
var locDescription = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"loc.Description", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Description "}};
$('#myModal #Description').append($compile(Mustache.to_html(text, locDescription.ErrMsg))($scope));
- var locLatitude = {"ErrMsg" : {"ipv4Err" : "IP Address is required.", "modalVar":"loc.Latitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Latitude","required":true}};
+ var locLatitude = {"ErrMsg" : {"errmsg" : "Latitude is required.", "modalVar":"loc.Latitude", "errtag":"textboxErrLatitude", "errfunc":"validatetextboxLatitude", "placeholder":"Latitude","required":true}};
$('#myModal #Latitude').append($compile(Mustache.to_html(text, locLatitude.ErrMsg))($scope));
- var locLongitude = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"loc.Longitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Longitude","required":true}};
+ var locLongitude = {"ErrMsg" : {"errmsg" : "Longitude is required.", "modalVar":"loc.Longitude", "errtag":"textboxErrLongitude", "errfunc":"validatetextboxLongitude", "placeholder":"Longitude","required":true}};
$('#myModal #Longitude').append($compile(Mustache.to_html(text, locLongitude.ErrMsg))($scope));
}
- $scope.validatetextbox = function (value){
- if($scope.loc.Id) {
- $scope.textboxErr = false;
- }
- else
- $scope.textboxErr = true;
- }
-
- $scope.validatetextbox = function (value){
- if($scope.loc.Country) {
- $scope.textboxErr = false;
- }
- else
- $scope.textboxErr = true;
- }
-
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxLocation = function (value){
if($scope.loc.Location) {
- $scope.textboxErr = false;
+ $scope.textboxErrLocation = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrLocation = true;
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxCountry = function (value){
+ if($scope.loc.Country) {
+ $scope.textboxErrCountry = false;
+ }
+ else
+ $scope.textboxErrCountry = true;
+ }
+
+ $scope.validatetextboxLatitude = function (value){
if($scope.loc.Latitude) {
- $scope.textboxErr = false;
+ $scope.textboxErrLatitude = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrLatitude = true;
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxLongitude = function (value){
if($scope.loc.Longitude) {
- $scope.textboxErr = false;
+ $scope.textboxErrLongitude = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrLongitude = true;
}
- $scope.validatenumeric = function (value){
- if($scope.loc.Latitude) {
- $scope.numericErr = false;
- }
- else
- $scope.numericErr = true;
- }
-
- $scope.validatenumeric = function (value){
- if($scope.loc.Longitude) {
- $scope.numericErr = false;
- }
- else
- $scope.numericErr = true;
- }
-
-
$scope.closeModal = function() {
console.log("Closing Modal...");
$('#myModal').modal('hide');
@@ -651,8 +635,10 @@
$scope.location = {};
//$("#myModal").modal();
$("#myModal").modal({}).draggable();
- $scope.textboxErr = false;
- $scope.numericErr = false;
+ $scope.textboxErrLocation = false;
+ $scope.textboxErrCountry = false;
+ $scope.textboxErrLatitude = false;
+ $scope.textboxErrLongitude = false;
}
$scope.saveData = function(id) {
if(id) {
@@ -806,25 +792,25 @@
//var linkType = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.type"}};
$('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownlinkData))($scope));
- var linkLayerRate = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.layerRate"}};
+ var linkLayerRate = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.layerRate"}};
$('#myModal #layerRate').append($compile(Mustache.to_html(text, linkLayerRate.ErrMsg))($scope));
- var linkSourcePort = {"ErrMsg" : {"numericErr" : "The name is required.", "modalVar":"link.sourcePort"}};
+ var linkSourcePort = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.sourcePort"}};
$('#myModal #sourcePort').append($compile(Mustache.to_html(text, linkSourcePort.ErrMsg))($scope));
- var linkSinkPort = {"ErrMsg" : {"numericErr" : "IP Address is required.", "modalVar":"link.sinkPort"}};
+ var linkSinkPort = {"ErrMsg" : {"errmsg" : "IP Address is required.", "modalVar":"link.sinkPort"}};
$('#myModal #sinkPort').append($compile(Mustache.to_html(text, linkSinkPort.ErrMsg))($scope));
- var linkSourceNe = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.sourceNE"}};
+ var linkSourceNe = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.sourceNE"}};
$('#myModal #sourceNE').append($compile(Mustache.to_html(text, linkSourceNe.ErrMsg))($scope));
- var linkSinkNe = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.sinkNE"}};
+ var linkSinkNe = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.sinkNE"}};
$('#myModal #sinkNE').append($compile(Mustache.to_html(text, linkSinkNe.ErrMsg))($scope));
- var linkAdminState = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.adminState"}};
+ var linkAdminState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.adminState"}};
$('#myModal #adminState').append($compile(Mustache.to_html(text, linkAdminState.ErrMsg))($scope));
- var linkOperatingState = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"link.operatingState"}};
+ var linkOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"link.operatingState"}};
$('#myModal #operatingState').append($compile(Mustache.to_html(text, linkOperatingState.ErrMsg))($scope));
}
@@ -1018,58 +1004,51 @@
var number = $(modelTemplate).filter('#numeric').html();
var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();
- var neName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};
+ var neName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName","required":true}};
$('#myModal #name').append($compile(Mustache.to_html(text, neName.ErrMsg))($scope));
- var neVersion = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};
+ var neVersion = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};
$('#myModal #version').append($compile(Mustache.to_html(text, neVersion.ErrMsg))($scope));
- var neProductName = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"ne.productname" }};
+ var neProductName = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.productname" }};
$('#myModal #productname').append($compile(Mustache.to_html(text, neProductName.ErrMsg))($scope));
$('#myModal #controller').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownneData))($scope));
- var neIPAddress = {"ErrMsg" : {"ipv4Err" : "IP Address is required.", "modalVar":"ne.ipaddress"}};
+ var neIPAddress = {"ErrMsg" : {"errmsg" : "IP Address is required.", "modalVar":"ne.ipaddress"}};
$('#myModal #ipaddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));
- var neNERole = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"ne.nerole"}};
+ var neNERole = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.nerole"}};
$('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));
- var neAdminState = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"ne.adminState"}};
+ var neAdminState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.adminState"}};
$('#myModal #adminState').append($compile(Mustache.to_html(text, neAdminState.ErrMsg))($scope));
- var neOperatingState = {"ErrMsg" : {"textboxErr" : "The name is required.", "modalVar":"ne.operatingState"}};
+ var neOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.operatingState"}};
$('#myModal #operatingState').append($compile(Mustache.to_html(text, neOperatingState.ErrMsg))($scope));
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxName = function (value){
if($scope.ne.name) {
- $scope.textboxErr = false;
+ $scope.textboxErrName = false;
}
else
- $scope.textboxErr = true;
+ $scope.textboxErrName = true;
}
- $scope.validatetextbox = function (value){
+ $scope.validatetextboxVersion = function (value){
if($scope.ne.version) {
- $scope.textboxErr = false;
+ $scope.textboxErrVersion = false;
}
else
- $scope.textboxErr = true;
- }
-
- $scope.validateipv4 = function (value){
- if($scope.ne.ipaddress) {
- $scope.ipv4Err = false;
- }
- else
- $scope.ipv4Err = true;
+ $scope.textboxErrVersion = true;
}
$scope.closeModal = function() {
console.log("Closing Modal...");
$('#myModal').modal('hide');
+ $scope.textboxErrName = false;
}
@@ -1083,9 +1062,8 @@
$scope.showAddModal = function() {
console.log("Showing Modal to Add data");
$scope.ne = {};
- $scope.textboxErr = false;
- $scope.ipv4Err = false;
- $scope.numericErr = false;
+ $scope.textboxErrName = false;
+ $scope.textboxErrVersion = false;
//$("#myModal").modal();
$("#myModal").modal({}).draggable();
}
diff --git a/resmgr/src/main/webapp/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/link/link.html
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/link/linkRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/linkRest.js
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/link/linkRest.js
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/link/linkRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/ne/ne.html
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/ne/neRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/ne/neRest.js
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/port/port.html
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/port/portRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/port/portRest.js
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/site/site.html
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/site/siteRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/siteRest.js
similarity index 100%
rename from resmgr/src/main/webapp/sdn-resmgr/site/siteRest.js
rename to resmgr/src/main/webapp/resmgr/sdn-resmgr/site/siteRest.js
diff --git a/resmgr/src/main/webapp/templates/resource.html b/resmgr/src/main/webapp/resmgr/templates/resource.html
similarity index 100%
rename from resmgr/src/main/webapp/templates/resource.html
rename to resmgr/src/main/webapp/resmgr/templates/resource.html
