wakame-vdc-webui 11.06.0 → 11.12.0

data/lib/cli/user.rb

@@ -7,41 +7,6 @@ require 'yaml'
 module Cli
   class UserCli < Base
     namespace :user
-
-    #no_tasks {
-      #def before_task
-        ## Setup DB connections and load paths for dcmgr_gui
-        #root_dir = File.expand_path('../../../', __FILE__)
-        
-        ##get the database details
-        ##TODO:get this path in a less hard-coded way?
-        #content = File.new(File.expand_path('../../frontend/dcmgr_gui/config/database.yml', root_dir)).read
-        #settings = YAML::load content
-        
-        ##load the database variables
-        ##TODO: get environment from RAILS_ENV
-        #db_environment = 'development'
-        #db_adapter = settings[db_environment]['adapter']
-        #db_host    = settings[db_environment]['host']
-        #db_name    = settings[db_environment]['database']
-        #db_user    = settings[db_environment]['user']
-        #db_pwd     = settings[db_environment]['password']
-        
-        ##Connect to the database
-        #url = "#{db_adapter}://#{db_host}/#{db_name}?user=#{db_user}&password=#{db_pwd}"
-        #db = Sequel.connect(url)
-        
-        ##load the cli environment
-        #$LOAD_PATH.unshift File.expand_path('../../frontend/dcmgr_gui/config', root_dir)
-        #$LOAD_PATH.unshift File.expand_path('../../frontend/dcmgr_gui/app/models', root_dir)
-        
-        #require 'environment-cli'
-        #require 'user'
-        #require 'account'
-        #User.db = db
-        #Account.db = db
-      #end
-    #}
     
     desc "add [options]", "Create a new user."
     method_option :name, :type => :string, :required => true, :aliases => "-n", :desc => "The name for the new user." #Maximum size: 200
@@ -49,7 +14,6 @@ module Cli
     method_option :login_id, :type => :string, :aliases => "-l", :desc => "Optional: The login_id for the new user." #Maximum size: 255
     method_option :password, :type => :string, :required => true, :aliases => "-p", :desc => "The password for the new user." #Maximum size: 255
     method_option :primary_account_id, :type => :string, :aliases => "-a", :desc => "Optional: The primary account to associate this user with." #Maximum size: 255
-    #method_option :verbose, :type => :boolean, :aliases => "-v", :desc => "Print feedback on what is happening."
     def add
       if options[:name].length > 200
         Error.raise("User name can not be longer than 200 characters", 100)
@@ -140,7 +104,6 @@ __END
     method_option :name, :type => :string, :aliases => "-n", :desc => "The new name for the user." #Maximum size: 200    
     method_option :login_id, :type => :string, :aliases => "-l", :desc => "The new login_id for the user." #Maximum size: 255
     method_option :password, :type => :string, :aliases => "-p", :desc => "The new password for the user." #Maximum size: 255
-    #method_option :primary_account_id, :type => :string, :aliases => "-a", :desc => "The new primary account to associate this user with."
     def modify(uuid)
       Error.raise("User name can not be longer than 200 characters",100) if options[:name] != nil && options[:name].length > 200
       Error.raise("User login_id can not be longer than 255 characters",100) if options[:login_id] != nil && options[:login_id].length > 255

data/lib/tasks/dcmgr_gui.rake

@@ -33,8 +33,8 @@ namespace :db do
     DB['users_accounts'].with_sql(sql,2,2).first
 
     publish_date = '2010-11-19 9:00:00'
-    title = "新機能の提供を開始しました。"
-    description = "・GUIの提供・KVM対応\n・EBSとしてZFS対応\n・セキュリティグループ対応'\n"
+    title = "News1"
+    description = "New description."
     
     Information.create(:title => title,
                        :description => description,

data/public/i18n/Messages_en.properties

@@ -0,0 +1,34 @@
+code_error_box = ErrorCode
+stop_button = Stop
+close_button = Close
+delete_button = Yes, Delete
+terminate_button = Terminate
+refresh_button = Refresh
+start_button = Start
+attach_button = Yes, Attach
+reboot_button = Reboot
+create_button = Create
+update_button = Update
+launch_button = Launch
+detach_button = Yes, Detach
+loading_parts = Loading...
+display_date = {0}-{1}-{2} {3}:{4}:{5}
+launch_instance_header = Launch Instance
+delete_security_group_header = Delete Security Group
+stop_instances_header = Stop Instances
+start_instances_header = Start Instances
+delete_ssh_keypair_header = Delete SSH Key Pair
+create_volume_from_snapshot_header = Create Volume 
+delete_snapshot_header = Delete Snapshot
+terminate_instances_header = Terminate Instances
+create_security_group_header = Create Security Group
+delete_volume_header = Delete Volume
+reboot_instances_header = Reboot Instances
+create_snapshot_header = Create Snapshot
+detach_volume_header = Detach Volume
+create_ssh_keypair_header = Create SSH Key Pair
+attach_volume_header = Attach Volume
+create_volume_header = Create Volume
+edit_security_group_header = Edit Security Group
+total_pagenate = Total {0}
+page_pagenate = {0} Page

data/public/i18n/Messages_ja.properties

@@ -0,0 +1,32 @@
+code_error_box = エラーコード
+stop_button = 一時停止
+close_button = 閉じる
+delete_button = 削除
+terminate_button = 停止
+refresh_button = 更新
+start_button = 再開
+attach_button = アタッチ
+reboot_button = 再起動
+create_button = 作成
+update_button = 更新
+launch_button = 起動
+detach_button = デタッチ
+loading_parts = 読み込み中...
+display_date = {0}年{1}月{2}日 {3}時{4}分{5}秒
+launch_instance_header = インスタンスを起動
+delete_security_group_header = セキュリティーグループを削除
+delete_ssh_keypair_header = キーペアを削除
+create_volume_from_snapshot_header = ボリュームを作成
+delete_snapshot_header = スナップショットを削除
+terminate_instances_header = インスタンスを停止
+create_security_group_header = セキュリティグループを作成
+delete_volume_header = ボリュームを削除
+reboot_instances_header = インスタンスを再起動
+create_snapshot_header = スナップショットを作成
+detach_volume_header = ボリュームをデタッチ
+create_ssh_keypair_header = キーペアを作成
+attach_volume_header = ボリュームをアタッチ
+create_volume_header = ボリュームを作成
+edit_security_group_header = セキュリティグループを編集
+total_pagenate = 全{0}件
+page_pagenate = {0} ページ

data/public/javascripts/dcmgr_gui/application.js

@@ -9,7 +9,7 @@ jQuery(function($){
   dcmgrGUI.initialize();
   dcmgrGUI.notification = new DcmgrGUI.Notification;
 
-	//サイドメニュー開閉関数
+	//Toggle side menus.
 	var regionpos = 0;
 	$('#regionselect').click(function () {
 		if(regionpos==0){regionpos+=33;}else{regionpos=0;}
@@ -24,10 +24,10 @@ jQuery(function($){
 		$('#regionmenu').toggle();
 	});
 	
-	//maincontent開閉関数
+	//Toggle maincontent
   $('.showhide').click(function(){
-   $(this).parent().next().toggle();//開閉
-   //backgroundの切り替え
+   $(this).parent().next().toggle();
+   //Swap background image.
    var imgurl = $(this).css("background-image");
    var img = imgurl.match(/.+\/images\/(btn_[a-z]+\.gif)/);
    if(img[1] == "btn_hide.gif"){
@@ -39,7 +39,7 @@ jQuery(function($){
    }
   });
   
-	//InstanceActionsメニュー開閉関数
+	//Toggle InstanceActions menu.
 	var instancepos = 0;
 	$('#instanceaction').click(function () {
 		if(instancepos==0){instancepos+=26;}else{instancepos=0;}
@@ -54,7 +54,7 @@ jQuery(function($){
 		$('#actionlist').toggle();
 	});
 	
-	//VolumeActionsメニュー開閉関数
+	//Toggle VolumeActions menu.
 	var volumepos = 0;
 	$('#volumeaction').click(function () {
 		if(volumepos==0){volumepos+=26;}else{volumepos=0;}
@@ -69,7 +69,7 @@ jQuery(function($){
 		$('#volumelist').toggle();
 	});
 	
-	//ReservedInstancesメニュー開閉関数
+	//Toggle ReservedInstances menu.
 	var rsvinstancepos = 0;
 	$('#reservedinstance').click(function () {
 		if(rsvinstancepos==0){rsvinstancepos+=26;}else{rsvinstancepos=0;}

data/public/javascripts/dcmgr_gui/core.js

@@ -110,7 +110,7 @@ DcmgrGUI.date.parseISO8601 = function (str) {
   _date = new Date;
 
   _date.setUTCFullYear(Number(dateParts[0]));
-  _date.setUTCMonth(Number(dateParts[1]));
+  _date.setUTCMonth(Number(dateParts[1] - 1 ));
   _date.setUTCDate(Number(dateParts[2]));
   _date.setUTCHours(Number(timeHours));
   _date.setUTCMinutes(Number(timeSubParts[1]));
@@ -133,11 +133,11 @@ DcmgrGUI.date.getI18n = function(date_str){
   }
 
   return $.i18n.prop('display_date', [date_str.getUTCFullYear(), 
-                                   convert(date_str.getUTCMonth()), 
-                                   convert(date_str.getUTCDate()), 
-                                   convert(date_str.getUTCHours()), 
-                                   convert(date_str.getUTCMinutes()), 
-                                   convert(date_str.getUTCSeconds())
+                                   convert(date_str.getMonth() + 1), 
+                                   convert(date_str.getDate()), 
+                                   convert(date_str.getHours()), 
+                                   convert(date_str.getMinutes()), 
+                                   convert(date_str.getSeconds())
                                    ]);
 };
 
@@ -455,6 +455,33 @@ DcmgrGUI.Util.createUIButton = function(element,options){
           });
 }
 
+DcmgrGUI.Util.availableTextField = function(e){
+
+  var d = e.data;
+  var button = d.button;
+  var element_id = d.element_id;
+
+  if(e.type == 'paste') {
+    var el = $(this);
+    setTimeout(function() {
+      var text = $(el).val();
+      if(text) {
+        button.disabledButton(element_id, false);
+      } else {
+        button.disabledButton(element_id, true);
+      }
+    }, 100);       
+  } else {
+    var text = $(this).val();
+    if(text) {
+      button.disabledButton(element_id, false);
+    } else {
+      button.disabledButton(element_id, true);
+    }
+  }
+  return true;
+}
+
 DcmgrGUI.Event = DcmgrGUI.Class.create({
 
   initialize: function(){
@@ -538,13 +565,11 @@ DcmgrGUI.List = DcmgrGUI.Class.create(DcmgrGUI.ContentBase, {
       
       if(data.item.created_at) {
         data.item.created_at = DcmgrGUI.date.parseISO8601(data.item.created_at);
-        data.item.created_at = DcmgrGUI.date.setTimezoneOffset(data.item.created_at, dcmgrGUI.getConfig('time_zone_utc_offset'));
         data.item.created_at = DcmgrGUI.date.getI18n(data.item.created_at);
       }
 
       if(data.item.updated_at) {
         data.item.updated_at = DcmgrGUI.date.parseISO8601(data.item.updated_at);
-        data.item.updated_at = DcmgrGUI.date.setTimezoneOffset(data.item.updated_at, dcmgrGUI.getConfig('time_zone_utc_offset'));
         data.item.updated_at = DcmgrGUI.date.getI18n(data.item.updated_at);
       }
 

data/public/javascripts/dcmgr_gui/image_panel.js

@@ -102,18 +102,17 @@ DcmgrGUI.prototype.imagePanel = function(){
     var ssh_key_pair = $(this).find('#ssh_key_pair').find('option:selected').text();
     var launch_in = $(this).find('#right_select_list').find('option');
     var user_data = $(this).find('#user_data').val();
-    var nf_group = [];
+    var security_groups = [];
     $.each(launch_in,function(i){
-     nf_group.push("nf_group[]="+ $(this).text());
+     security_groups.push("security_groups[]="+ $(this).text());
     });
-    var nf_strings = nf_group.join('&');
 
     var data = "image_id="+image_id
               +"&host_pool_id="+host_pool_id
               +"&instance_spec_id="+instance_spec_id
               +"&host_name="+host_name
               +"&user_data="+user_data
-              +"&"+nf_strings
+              +"&" + security_groups.join('&')
               +"&ssh_key="+ssh_key_pair;
     
     request = new DcmgrGUI.Request;
@@ -221,9 +220,8 @@ DcmgrGUI.prototype.imagePanel = function(){
               }
 
               for (var i=0; i < size ; i++) {
-                var name = results[i].result.name;
                 var ssh_keypair_id = results[i].result.id;
-                var html = '<option id="'+ ssh_keypair_id +'" value="'+ name +'">'+name+'</option>'
+                var html = '<option id="'+ ssh_keypair_id +'" value="'+ ssh_keypair_id +'">'+ssh_keypair_id+'</option>'
                 select_keypair.append(html);
               }
             }
@@ -235,12 +233,12 @@ DcmgrGUI.prototype.imagePanel = function(){
             "data": "",
             success: function(json,status){
               var data = [];
-              var results = json.netfilter_group.results;
+              var results = json.security_group.results;
               var size = results.length;
               for (var i=0; i < size ; i++) {
                 data.push({
                   "value" : results[i].result.uuid,
-                  "name" : results[i].result.name
+                  "name" : results[i].result.uuid,
                 });
               }
 

data/public/javascripts/dcmgr_gui/instance_panel.js

@@ -102,29 +102,27 @@ DcmgrGUI.prototype.instancePanel = function(){
     target:'.start_instances',
     width:400,
     height:200,
-    title:'Start Instances',
+    title:$.i18n.prop('start_instances_header'),
     path:'/start_instances',
-    button:{
-     "Close": function() { $(this).dialog("close"); },
-     "Yes, Start": function() { 
-       $(this).dialog("close");
-     }
-    }
+    button:{},
   });
-  
+  bt_instance_start.button[$.i18n.prop('close_button')]=function() { $(this).dialog("close"); };
+  bt_instance_start.button[$.i18n.prop('start_button')]=function() {
+      instance_action_helper.call(this,'start');
+  };
+
   var bt_instance_stop = new DcmgrGUI.Dialog({
      target:'.stop_instances',
      width:400,
-		 height:200,
-		 title:'Stop Instances',
-		 path:'/stop_instances',
-		 button:{
-			"Close": function() { $(this).dialog("close"); },
-			"Yes, Stop": function() {
-			  $(this).dialog("close");
-			}
-		}
+     height:200,
+     title: $.i18n.prop('stop_instances_header'),
+     path:'/stop_instances',
+     button:{},
   });
+  bt_instance_stop.button[$.i18n.prop('close_button')]=function() { $(this).dialog("close"); };
+  bt_instance_stop.button[$.i18n.prop('stop_button')]=function() {
+      instance_action_helper.call(this,'stop');
+  };
   
   var instance_reboot_buttons = {};
   instance_reboot_buttons[close_button_name] = function() { $(this).dialog("close"); }
@@ -154,14 +152,6 @@ DcmgrGUI.prototype.instancePanel = function(){
     button: instance_terminate_buttons
   });
   
-  bt_instance_start.target.bind('click',function(){
-    bt_instance_start.open(c_list.getCheckedInstanceIds());
-  });
-
-  bt_instance_stop.target.bind('click',function(){
-    bt_instance_stop.open(c_list.getCheckedInstanceIds());
-  });
-
   bt_refresh.element.bind('dcmgrGUI.refresh',function(){
     c_list.page = c_pagenate.current_page;
     list_request.url = DcmgrGUI.Util.getPagePath('/instances/list/',c_list.page);
@@ -190,10 +180,20 @@ DcmgrGUI.prototype.instancePanel = function(){
     style:'dropdown',
     select: function(event){
       var select_action = $(this).val()
-      if (select_action == "terminate") {
-        bt_instance_terminate.open(c_list.getCheckedInstanceIds());
-      }else if(select_action == "reboot") {
-        bt_instance_reboot.open(c_list.getCheckedInstanceIds());
+      var selected_ids = c_list.getCheckedInstanceIds();
+      switch(select_action) {
+      case 'terminate':
+        bt_instance_terminate.open(selected_ids);
+        break;
+      case 'reboot':
+        bt_instance_reboot.open(selected_ids);
+        break;
+      case 'start':
+        bt_instance_start.open(selected_ids);
+        break;
+      case 'stop':
+        bt_instance_stop.open(selected_ids);
+        break;
       }
     }
   });

data/public/javascripts/dcmgr_gui/security_group_panel.js

@@ -9,7 +9,6 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   
   DcmgrGUI.List.prototype.getEmptyData = function(){
     return [{
-      "name":'',
       "description":''
     }]
   }
@@ -17,7 +16,6 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   
   DcmgrGUI.Detail.prototype.getEmptyData = function(){
     return {
-      "name" : "-",
       "description" : "-",
       "rule":''
     }
@@ -50,13 +48,7 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
       'element': this
     });
     
-    $(this).find('#security_group_name').keyup(function(){
-      if( $(this).val() ) {
-        bt_create_security_group.disabledButton(1, false);
-      } else {
-        bt_create_security_group.disabledButton(1 ,true);
-      }
-    });
+    var params = { 'button': bt_create_security_group, 'element_id': 1 };
 
     $(this).find('#rule_help').hide();
     security_group_help.create(config_tooltip);
@@ -86,9 +78,9 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   });
     
   c_list.element.bind('dcmgrGUI.contentChange',function(event,params){
-    var netfilter_group = params.data.netfilter_group;
-    c_pagenate.changeTotal(netfilter_group.owner_total);
-    c_list.setData(netfilter_group.results);
+    var security_group = params.data.security_group;
+    c_pagenate.changeTotal(security_group.owner_total);
+    c_list.setData(security_group.results);
     c_list.singleCheckList(c_list.detail_template);
 
     var edit_security_group_buttons = {};
@@ -115,7 +107,7 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
     var bt_edit_security_group = new DcmgrGUI.Dialog({
       target:'.edit_security_group',
       width:500,
-      height:590,
+      height:580,
       title:$.i18n.prop('edit_security_group_header'),
       path:'/edit_security_group',
       button: edit_security_group_buttons,
@@ -123,7 +115,7 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
     });
 
     bt_edit_security_group.target.bind('click',function(event){
-      var uuid = $(this).attr('id').replace(/edit_(ng-[a-z0-9]+)/,'$1');
+      var uuid = $(this).attr('id').replace(/edit_(sg-[a-z0-9]+)/,'$1');
       if( uuid ){
         bt_edit_security_group.open({"ids":[uuid]});
       }
@@ -164,23 +156,11 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   var create_security_group_buttons = {};
   create_security_group_buttons[close_button_name] = function() { $(this).dialog("close"); };
   create_security_group_buttons[create_button_name] = function() { 
-    var name = $(this).find('#security_group_name').val();
     var description = $(this).find('#security_group_description').val();
     var rule = $(this).find('#security_group_rule').val();
-    var data = 'name=' + name
-             +'&description=' + description
+    var data = 'description=' + description
              +'&rule=' + rule;
 
-    if(!name){
-     $('#security_group_name').focus();
-     return false;
-    }
-
-    if(!name.match(/[a-z_]+/)){
-     $('#security_group_name').focus();
-     return false;
-    }
-    
     var request = new DcmgrGUI.Request;
     request.post({
       "url": '/security_groups.json',
@@ -196,7 +176,7 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   var bt_create_security_group = new DcmgrGUI.Dialog({
     target:'.create_security_group',
     width:500,
-    height:590,
+    height:550,
     title:$.i18n.prop('create_security_group_header'),
     path:'/create_security_group',
     button: create_security_group_buttons,
@@ -205,7 +185,6 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
   
   bt_create_security_group.target.bind('click',function(){
     bt_create_security_group.open();
-    bt_create_security_group.disabledButton(1, true);
   });
   
   var delete_security_group_buttons = {};