wakame-vdc-webui 10.12.0 → 11.06.0

data/app/models/dcmgr_resource/volume_snapshot.rb

@@ -16,6 +16,7 @@ module DcmgrResource
     def self.create(params)
       snapshot = self.new
       snapshot.volume_id = params[:volume_id]
+      snapshot.destination = params[:destination]
       snapshot.save
       snapshot
     end
@@ -31,5 +32,10 @@ module DcmgrResource
       self.collection_name = @collection
       result
     end
+    
+    def self.upload_destination
+      result = self.get(:upload_destination)
+      result
+    end
   end
 end

data/app/models/information.rb

@@ -3,7 +3,7 @@ class Information < BaseNew
   with_timestamps
   inheritable_schema do
     String :title, :size=>255
+    String :link, :text=>true
     String :description, :text=>true
   end
-  
 end

data/app/models/oauth_consumer.rb

@@ -0,0 +1,15 @@
+require 'oauth'
+class OauthConsumer < BaseNew
+  
+  many_to_one :account
+  
+  with_timestamps
+  
+  inheritable_schema do
+    primary_key :id, :type=>Integer
+    String :key, :null => false, :size => 40
+    String :secret, :null => false, :size => 40
+    Integer :account_id, :null => false, :unique=>true
+    index :key, :unique=>true
+  end
+end

data/app/models/oauth_token.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+class OauthToken < BaseNew
+  attr_accessor :token
+  attr_accessor :secret
+
+  def generate_keys
+    self.token = OAuth::Helper.generate_key(40)[0,40]
+    self.secret = OAuth::Helper.generate_key(40)[0,40]
+  end
+end

data/app/models/user.rb

@@ -6,14 +6,33 @@ class User < BaseNew
   plugin :subclasses
 
   inheritable_schema do
+    Time   :last_login_at, :null=>false
     String :name, :fixed=>true, :size=>200, :null=>false
     primary_key :id, :type=>Integer
-    String :login_id
+    String :login_id, :unique=>true
     String :password, :null=>false
     String :primary_account_id
+    String :locale, :size=>255, :null => false
+    String :time_zone, :size=>255, :null => false
   end
 
   many_to_many :accounts,:join_table => :users_accounts
+ 
+  def before_create
+    set(:locale => I18n.default_locale.to_s)
+    set(:time_zone => Time.zone.name)
+    set(:last_login_at => Time.now.utc)
+    super
+  end
+ 
+  # Removes all relations to accounts before deleting the record
+  def before_destroy
+    relations = self.accounts
+    for ss in 0...relations.length do
+      self.remove_account(relations[0])		  
+    end
+    super
+  end
   
   class << self
     def authenticate(login_id,password)
@@ -42,5 +61,19 @@ class User < BaseNew
       salt = Digest::SHA1.hexdigest(DcmgrGui::Application.config.secret_token)
       Digest::SHA1.hexdigest("--#{salt}--#{password}--")
     end
+
+    def update_last_login(user_id)
+      u = User.find(:id => user_id)
+      u.last_login_at = Time.now
+      u.save
+    end
+
+    def update_settings(user_id, params)
+      u = User.find(:id => user_id)
+      p params
+      u.time_zone = params[:time_zone] || u.time_zone
+      u.locale = params[:locale] || u.locale
+      u.save
+    end
   end
 end

data/app/views/accounts/index.html.erb

@@ -1,68 +1,43 @@
+<% content_for :javascript do %>
+<%= javascript_include_tag 'dcmgr_gui/account_panel.js' %>
+<script type="text/javascript">
+jQuery(function($){
+	dcmgrGUI.accountPanel();
+});
+</script>
+<% end %>
+<style type="text/css">
+	.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { text-align:center; float: none;}
+</style>
 <div id="mainarea_wide">
-	<h3><img src="images/icon_resource.gif" />Personal Information<a href="#" class="showhide"></a></h3>
-	<div class="maincontent">
-		<div class="display_area">
-			<table class="ptn05" frame="void" cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td class="color1">Full name:</td>
-					<td><span class="textblock">thedesignium</span><a href="#" class="change"></a></td>
-				</tr>
-				<tr>
-					<td class="color1">E-mail Address/ID:</td>
-					<td>contact_with@thedesignium.com</td>
-				</tr>
-				<tr>
-					<td class="color1">Password:</td>
-					<td class="special">************</td>
-				</tr>
-				<tr>
-					<td class="color2">Address Line 1:</td>
-					<td><input type="text" class="type01" /><br />
-							<span class="small">Street address, P.O. box, company name, c/o</span>
-					</td>
-				</tr>
-				<tr>
-					<td class="color2">Address Line 2:</td>
-					<td><input type="text" class="type01" /><br />
-							<span class="small">Apartment, suite, unite, building, floor, etc.</span>
-					</td>
-				</tr>
-				<tr>
-					<td class="color2">City:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-				<tr>
-					<td class="color2">State, Province or Region:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-				<tr>
-					<td class="color2">ZIP or Postal Code:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-				<tr>
-					<td class="color2">Country:</td>
-					<td>
-						<select>
-							<option>Japan</option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="color2">Phone number:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-				<tr>
-					<td class="color2">Company Name:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-				<tr>
-					<td class="color2">Web Site URL:</td>
-					<td><input type="text" class="type02" /></td>
-				</tr>
-			</table>
-		</div>
-		<a href="#" class="savechange"></a>
-		<div class="spacer10"></div>
-	</div>
-	<div id="btm_maincontent_wide_last"></div>
-</div>
+	<h3><img src="images/icon_resource.gif" /><%= t("accounts.header") %></h3>
+  <div class="maincontent account">
+    <div id="account_top">
+      <div id="account_password"><%= link_to t("accounts.password.header"), :action => 'password' %></a></div>
+      <div id="account_information">
+        <blockquote>
+          <h4><%= t("accounts.top.information") %></h4>
+          <hr />
+          <p><%= t("accounts.top.last_login") %>: <span id="last_login_at"><%= user_last_login_at %></span></p>
+        </blockquote>
+      </div><!-- account_information -->
+      <div id="account_settings">
+      <% form_for :account, :url=>{:action => 'update_settings'}, :html => {:id => "settings_form"} do |f| %>
+        <blockquote>
+        <h4><%= t("accounts.top.settings") %></h4>
+        <hr />
+        <div id="account_top_timezone">
+        <span><%= t("accounts.top.timezone") %></span><%= f.time_zone_select( :time_zone, nil, :default => @current_user.time_zone, :include_blank => true) %>
+        </div>
+        <div id="account_top_locale">
+        <span><%= t("accounts.top.locale") %></span>
+        <%= f.select(:locale, @locales, :selected => session[:locale], :selected => @current_user.locale) %>
+        </div>
+        <p id="account_submit"><%= f.submit t("accounts.top.submit") %></p>
+      <% end %>
+      </blockquote>
+      </div><!-- account_settings -->
+    </div><!-- account_top -->
+  </div><!-- maincontent -->
+  <div id="btm_maincontent_wide_last"></div>
+</div><!-- mainarea_wide -->

data/app/views/accounts/password.html.erb

@@ -0,0 +1,35 @@
+<% content_for :javascript do %>
+<%= javascript_include_tag 'jquery.jBreadCrumb.1.1.js' %>
+<script type="text/javascript">
+  jQuery(function($){
+    $("#breadCrumb").jBreadCrumb();
+  });
+</script>
+<% end %>
+<div id="mainarea_wide">
+	<h3><img src="/images/icon_resource.gif" /><%= t("accounts.header") %></h3>
+  <div class="maincontent account">
+    <div id="breadCrumb" class="breadCrumb module account">
+      <ul>
+          <li>
+              <a href="/accounts"><%= t("accounts.header") %></a>
+          </li>
+          <li>
+              <%= t("accounts.password.header") %> 
+          </li>
+      </ul>
+    </div>
+    <div id="password">
+   <% form_for :account, :url=>{:action => 'password'}, :html => {:id => "change_password_form"} do |f| %>
+     <p><label for="password"><%= t("accounts.password.password") %><span class="required"> *</span></label><br /><input id="password" type="password" value="" name="password"></p>
+      <p><label for="new_password"><%= t("accounts.password.new_password") %><span class="required"> * </span></label><br /><input id="new_password" type="password" value="" name="new_password"></p>
+      <p><label for="confirm_password"><%= t("accounts.password.confirm_password") %><span class="required"> *</span></label><br /><input id="confirm_password" type="password" value="" name="confirm_password"></p>
+    <%= f.submit t("accounts.password.submit") %>
+      <% if @error_message %>
+        <p><div class="error_message"><%= @error_message %></div></p>
+      <% end %>
+    <% end %>
+    </div>
+  </div><!-- maincontent -->
+  <div id="btm_maincontent_wide_last"></div>
+</div><!-- mainarea_wide -->

data/app/views/dialog/attach_volume.html.erb

@@ -1,12 +1,12 @@
 <div id="attach_volume_dialog">
   <table>
     <tr>
-      <td>Volume ID:</td>
+      <td><%= t("dialog.attach_volume.volume_id") %>:</td>
       <td id="view_volume_id"><%= @volume_id %></td>
       <input id="volume_id" type="hidden" value="<%= @volume_id %>">
     </tr>
     <tr>
-      <td>Instance ID:</td>
+      <td><%= t("dialog.attach_volume.instance_id") %>:</td>
       <td><input id="instance_id" type="text" value=""></td>
     </tr>
   </table>

data/app/views/dialog/create_and_edit_security_group.html.erb

@@ -1,32 +1,65 @@
 <style type="text/css">
-	table td {
-		padding-top :10px;
-		padding-left :5px;
+	#create_security_group_dialog div {
+		padding-top :5px;
+		padding-bottom :5px;
 	}
 </style>
 <div id="create_security_group_dialog">
-	<table>
-		<tr>
-			<td>Name:</td>
-			<td>
-				<% if @name %>
-					<%= @name %>
-					<input type="hidden" id="security_group_name" value="<%= @name %>">
-				<% else %>
-					<input type="text" id="security_group_name" size="20"></td>
-				<% end %>
-				<input type="hidden" id="security_group_id" value="<%= @uuid %>">
-		</tr>
-		<tr>
-			<td>Description:</td>
-			<td><input type="text" id="security_group_description" size="43" value="<%= @description %>"></td>
-		</tr>
-		<tr>
-			<td>Rule:</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<textarea id="security_group_rule" rows="10" cols="10" style="width:442px;height:320px"><%= @rule %></textarea></td>
-		</tr>
-	</table>
-</div>
+		<div id="security_group_name_field">
+    <p><%= t("dialog.create_and_edit_security_group.name") %></p>
+    <% if @name %>
+        <input type="text" id="security_group_name" size="20" value="<%= @name %>" disabled>
+			<% else %>
+				<input type="text" id="security_group_name" size="20">
+			<% end %>
+			<input type="hidden" id="security_group_id" value="<%= @uuid %>">
+    </div>
+    <div id="security_group_description_field">
+    <p>
+      <%= t("dialog.create_and_edit_security_group.description") %>
+    </p> 
+		  <input type="text" id="security_group_description" size="43" value="<%= @description %>">
+    </div>
+    <div id="security_group_rule_field">
+    <p>
+      <%= t("dialog.create_and_edit_security_group.rule") %> [<span rel="#rule_help" id="security_group_help" title="Rule Help" style="color:red">?</span>]
+    </p>
+    </div>
+			<textarea id="security_group_rule" rows="10" cols="10" style="width:442px;height:320px" ><%= @rule %></textarea>
+  <div id="rule_help">
+  <pre>
+SYNOPSIS
+
+  "protocol", "from port", "to port",   "source cidr" 
+  "protocol", "from port", "to port",   "source account_id:group" 
+  "protocol", "icmp type", "icmp code", "source cidr" 
+  "protocol", "icmp type", "icmp code", "source account_id:group" 
+
+PARAMETERS
+
+  protocol:
+   tcp, udp, icmp
+
+  from port:
+   1 .. 65535
+
+  to port:
+   1 .. 65535
+
+  icmp type:
+   -1 or 0,       3,    5,       8,        11, 12, 13, 14, 15, 16, 17, 18
+   '-1' means wild card.
+
+  icmp code:
+    -1 or 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 
+   '-1' means wild card.
+
+  source account:group
+    ex. a-trustedx:default
+
+  source cidr:
+    ex. 0.0.0.0/0, 192.168.0.0/24
+
+   </pre> 
+  </div>
+</div>

data/app/views/dialog/create_snapshot.html.erb

@@ -1,7 +1,14 @@
-<p>Are you sure you want to create the following snapshot?</p>
+<div id="create_snapshost_dialog">
+<p><%= t("dialog.create_snapshot.message") %></p>
+<% form_tag :action => "create_snapshot" do %>
 <br />
+store to:&nbsp;  
+<span id="select_destination">
+</span>
 <ul id="create_snapshots">
-        <% @volume_ids.each do |volume_id| %>
-                <li><%= volume_id %></li>
-        <% end %>
+  <% @volume_ids.each do |volume_id| %>
+    <li><%= volume_id %></li>
+  <% end %>
 </ul>
+<% end %>
+</div>

data/app/views/dialog/create_ssh_keypair.html.erb

@@ -1,12 +1,12 @@
 <div id="create_ssh_keypair_dialog">
 	<table>
 		<tr>
-			<td>Key Pair Name:</td>
+			<td><%= t("dialog.create_ssh_keypair.keypair_name")%>:</td>
 			<td>
 				<input id="ssh_keypair_name" type="text" name="name" >
 			</td>
 		<tr>
-			<td>Download Once: </td>
+			<td><%= t("dialog.create_ssh_keypair.download_once")%>: </td>
 			<td>
 				<input id="ssh_keypair_download_once" type="checkbox" name="download_once" checked>
 			</td>

data/app/views/dialog/create_volume.html.erb

@@ -1,18 +1,17 @@
 <div id="create_volume_dialog">
 	<table>
 		<tr>
-			<td>Size:</td>
+			<td><%= t("dialog.create_volume.size") %>:</td>
 			<td>
 				<input id="volume_size" type="text" name="size" size="2" maxlength="3">
 				<select id="unit">
 					<option value="gb">GB</option>
-					<option value="tb">TB</option>
 				</select>
 			</td>
 			<tr>
-				<td>Storage:</td>
+				<td><%= t("dialog.create_volume.storage") %>:</td>
 				<td id="select_storage_pool"></td>
 			</tr>
 		</tr>
 	</table>
-</div>
+</div>

data/app/views/dialog/create_volume_from_snapshot.html.erb

@@ -1,4 +1,4 @@
-<p>Are you sure you want to create the following volume?</p>
+<p><%= t("dialog.create_volume_from_snapshot.message") %></p>
 <br />
 <ul id="create_volumes">
         <% @snapshot_ids.each do |snapshot_id| %>

data/app/views/dialog/delete_security_group.html.erb

@@ -1,4 +1,4 @@
-<p>Are you sure you want to delete the following security_group?</p>
+<p><%= t("dialog.delete_security_group.message") %></p>
 <br />
 	<span id="delete_group_name"><%= @name %></span>
 	<input type="hidden" id="security_group_id" value="<%= @uuid %>">

data/app/views/dialog/delete_snapshot.html.erb

@@ -1,4 +1,4 @@
-<p>Are you sure you want to delete the following snapshot?</p>
+<p><%= t("dialog.delete_snapshot.message") %></p>
 <br />
 <ul id="delete_snapshots">
         <% @snapshot_ids.each do |snapshot_id| %>