ocp_registry 0.0.1.alpha → 0.0.5.pre

data/views/comment_list.erb

@@ -0,0 +1,12 @@
+<%
+	#Expected Passed-in Parameters Below
+	comment_list=comment_list		# an array of {'who'=>?, 'text'=>?, 'date'=>?, 'highlight'=>?}
+%>
+
+<div class="comment-list">
+<% comment_list.each do |c| %>
+
+	<%=erb :post, :locals => {:who=>c[:who], :text=>c[:text], :date=>c[:date], :highlight=>c[:highlight]} %>
+
+<% end %>
+</div>

data/views/inform_comment_dialog.erb

@@ -0,0 +1,10 @@
+<div id="inform-dialog" class="dialog comment-dialog inform-dialog modal hide" tabindex="-1" role="dialog" aria-labelledby="Comment for Changing the Request" aria-hidden="true">
+	<legend>Comment</legend>
+	<textarea name="comment" placeholder="Put your comment for rejection here ..."></textarea>
+
+	<div class="action">
+		<button class="confirm btn btn-primary to-right">Confirm</button>
+		<button class="cancel btn to-left">Cancel</button>
+		<div class="clear"></div>
+	</div>
+</div>

data/views/post.erb

@@ -0,0 +1,28 @@
+<%
+	#Expected Passed-in Parameters Below
+	text=text
+	date=date
+	who=(who=='admin') ? 'admin' : 'applicant'
+	highlight=highlight
+
+	#Calculate Useful Variables
+	who_name=(who=='admin') ? 'Admin' : 'Applicant'
+	portrait_path=(who=='admin') ? '/images/portrait_admin.png' : '/images/portrait_applicant.png' 
+	highlight_class=highlight ? 'highlight' : '' 
+
+%>
+
+<div class="post box <%=highlight_class%>">
+	<div class="user to-left">
+		<img class="portrait" src="<%=portrait_path%>" alt="No Portrait"></img>
+		<label class="name text-center"><%=who_name%></label>
+	</div>
+	<div class="content to-left">
+		<div class="text"><%=text%></div>
+		<div class="tool">
+			<div class="date to-right"><%=date%></div>
+			<div class="clear-float"></div>
+		</div>
+	</div>
+	<div class="clear-float"></div>
+</div>

data/views/reject_comment_dialog.erb

@@ -0,0 +1,10 @@
+<div id="reject-dialog" class="dialog comment-dialog reject-dialog modal hide" tabindex="-1" role="dialog" aria-labelledby="Rejection Comment" aria-hidden="true">
+	<legend>Comment</legend>
+	<textarea name="comment" placeholder="Put your comment for rejection here ..."></textarea>
+
+	<div class="action">
+		<button class="confirm btn btn-primary to-right">Confirm</button>
+		<button class="cancel btn to-left">Cancel</button>
+		<div class="clear"></div>
+	</div>
+</div>

data/views/tenant_options.erb

@@ -0,0 +1,244 @@
+<%
+	#Expected Passed-in Parameters Below
+	who=(who=='admin')? 'admin' : 'applicant'  		#who is using this page, admin or applier
+	review=review		#is this page used for reviewing a request, or for filling a new request?
+
+	tenant_info=tenant_info
+	quotas_origin=quotas_origin
+	quotas_prev=quotas_prev		#if don't have, set it to null
+
+	#Calculate useful variables
+	whoOppsite=(who=='admin')? 'applicant' : 'admin'
+	compare=(quotas_prev!=nil)		#need to compare current and last version of quotas?
+%>
+
+<div id="tenant-options" class="tenant-opt">
+	<ul class="nav nav-tabs">
+		<li><a href="#tenant-options-tenant-info" data-toggle="tab">Project Info</a></li>
+		<li><a href="#tenant-options-quota" data-toggle="tab">Quota</a></li>
+	</ul>
+	
+	<div class="tab-content to-left">
+		<div class="tab-pane tenant-info" id="tenant-options-tenant-info">
+			<label>Project Name</label>
+			<input type="text" name="project" value="<%=tenant_info[:project]%>" placeholder="Put the project name here.">
+			
+			<label>Description</label>
+			<input type="text" name="description" value="<%=tenant_info[:description]%>" placeholder="Put the project description here.">
+			
+			<label>Email</label>
+			<input type="text" name="email" value="<%=tenant_info[:email]%>" placeholder="Put your valid email address here.">
+		</div>
+		<div class="tab-pane quota" id="tenant-options-quota">
+			<label>Metadata Items</label>
+			<input type="text" name="metadata_items" value="<%=quotas_origin["metadata_items"]%>">
+			
+			<label>VCPUs</label>
+			<input type="text" name="cores" value="<%=quotas_origin["cores"]%>">
+			
+			<label>Instances</label>
+			<input type="text" name="instances" value="<%=quotas_origin["instances"]%>">
+			
+			<label>Injected Files</label>
+			<input type="text" name="injected_files" value="<%=quotas_origin["injected_files"]%>">
+			
+			<label>Injected Files Content Bytes</label>
+			<input type="text" name="injected_file_content_bytes" value="<%=quotas_origin["injected_file_content_bytes"]%>">
+			
+			<label>Volumes</label>
+			<input type="text" name="volumes" value="<%=quotas_origin["volumes"]%>">
+			
+			<label>Gigabytes</label>
+			<input type="text" name="gigabytes" value="<%=quotas_origin["gigabytes"]%>">
+			
+			<label>RAM(MB)</label>
+			<input type="text" name="ram" value="<%=quotas_origin["ram"]%>">
+			
+			<label>Floating IPs</label>
+			<input type="text" name="floating_ips" value="<%=quotas_origin["floating_ips"]%>">
+			
+			<label>Fixed IPs</label>
+			<input type="text" name="fixed_ips" value="<%=quotas_origin["fixed_ips"]%>">
+			
+			<label>Security Groups</label>
+			<input type="text" name="security_groups" value="<%=quotas_origin["security_groups"]%>">
+			
+			<label>Security Group Rules</label>
+			<input type="text" name="security_group_rules" value="<%=quotas_origin["security_group_rules"]%>">
+		</div>
+	</div>
+	
+	<div class="opt-explain to-left">
+			Details of your project 
+	</div>
+	
+	<div class="clear-float"></div>
+				
+</div>
+
+<script type="text/javascript">
+
+//The handle to tenant options element
+var tenantOpts={
+	changed: false, 
+	onChange: function(){},
+	onRestore: function(){},
+	restore: function(){},
+
+	getQuotasNow: function(){},
+	quotasOrigin: $.parseJSON('<%=JSON.generate(quotas_origin, quirks_mode: true)%>'), 
+	quotasPrev: $.parseJSON('<%=JSON.generate(quotas_prev, quirks_mode: true)%>'), 
+
+    getData: function(){}, 
+};
+
+(function(){
+
+	$(document).ready(init);
+
+	var review=$.parseJSON('<%=JSON.generate(review, quirks_mode: true)%>');
+	var compare=$.parseJSON('<%=JSON.generate(compare, quirks_mode: true)%>');
+
+	function init(){
+		initTab();
+		initReadonly();
+		initHighlight();
+		initTooltip();
+		initInputEvent();
+		initFunc();
+	}
+	
+	function initTab(){
+		$('#tenant-options .nav-tabs a:first').tab('show');
+	}
+
+	function initReadonly(){
+		if(!review){
+			return;
+		}
+
+		$('#tenant-options .tenant-info input').attr('readonly', 'true');
+	}
+
+	function initHighlight(){
+		if(!compare){
+			return;
+		}
+
+		$.each(util.whoChanged(tenantOpts.quotasOrigin, tenantOpts.quotasPrev), function(i,v){
+			$('#tenant-options .quota input[name='+i+']').addClass('highlight');
+		});
+	}
+
+	function initTooltip(){
+		if(!compare){
+			return;
+		}
+
+		$.each(util.whoChanged(tenantOpts.quotasOrigin, tenantOpts.quotasPrev), function(i,v){
+			var $field=$('#tenant-optons .quota input[name='+i+']');
+			$field.after('<div class="hidden">'
+							+'<p>The <%=whoOppsite%> proposed a new value here. The original is \'<b>'
+							+((v[0]===undefined)?'':v[0])
+							+'</b>\'.</p>'
+						  +'</div>'
+						);
+			$field.qtip({
+				content: {
+					text: $field.next('div')
+				},
+				show: {
+		            effect: function() {
+		                $field.fadeTo(200, 1);
+		            }
+		        },
+		        hide: {
+		            effect: function() {
+		                $field.fadeTo(200, 0);
+		            }
+       			 }
+			});
+
+		});
+	}
+
+	function initInputEvent(){
+
+		function onFieldModified(name){
+			addLabelMark(name);
+
+			if(!tenantOpts.changed){
+				tenantOpts.changed=true;
+				tenantOpts.onChange();
+			}
+		}
+
+		$('#tenant-options .quota input').keydown(function(){
+			var name=$(this).attr('name');
+			onFieldModified(name);
+		});
+	}
+
+	function initFunc(){
+		tenantOpts.restore=restore;
+		tenantOpts.getQuotasNow=getQuotasNow;
+		tenantOpts.getData=getData;
+	}
+
+	function addLabelMark(fieldName){
+		var $label=$('#tenant-options .quota input[name='+fieldName+']').prev('label');
+		if(!($label.text().match(/\*$/))){
+			$label.text($label.text()+' *');
+			$label.css({color: '#CC0000'});
+		}
+	}
+
+	function removeLabelMark(){
+		$('#tenant-options .quota input').each(function(i, v){
+			var $field=$(this);
+			var $label=$field.prev('label');
+
+			if($label.text().match(/\*$/)){
+				$label.text($label.text().slice(0, -2));
+				$label.css({color: 'black'});
+			}
+		});
+	}
+
+	function getQuotasNow(){
+		var ret={};
+		$('#tenant-options .quota input').each(function(){
+			var $field=$(this);
+			var name=$field.attr('name');
+
+			ret[name]=$field.val();
+		});
+
+		return ret;
+	}
+
+	function getData(){
+		var ret={};
+		$('#tenant-options .tenant-info input').each(function(){
+			var $field=$(this);
+			var name=$field.attr('name');
+
+			ret[name]=$field.val();
+		});
+
+		ret.settings=getQuotasNow();
+		return ret;
+	}
+
+	function restore(){
+		removeLabelMark();
+		$('#tenant-options .quota input').each(function(){
+			var $field=$(this);
+			$field.val(tenantOpts.quotasOrigin[$field.attr('name')]);
+		});
+		tenantOpts.changed=false;
+		tenantOpts.onRestore();
+	}
+
+})();
+</script>

data/views/view.erb

@@ -1,7 +1,44 @@
-
-<div class="bordered optDialog">
-	<legend>Browse Project Request</legend>
-
-	<%=erb :show, :locals => {:data=>data, :readonly=>true} %>
-				
-</div>
+<%
+	#Expected Passed-in Parameters Below
+	data=data
+
+	#Calculate Useful Variables
+	first_version=(nil == data[:registry_settings][1])
+
+	tenant_info=data
+	quotas_origin=Yajl::load(data[:registry_settings][0][:settings])
+	quotas_prev= first_version ? nil : (Yajl::load(data[:registry_settings][1][:settings]))
+
+	comment_list=get_comment_list_from_data(data)
+%>
+
+<div id="tenant-opt-dialog" class="dialog tenant-opt-dialog">
+	<legend>View Project Request</legend>
+
+	<%=erb :tenant_options, :locals => {
+		:who=>'applicant', 
+		:review=>true, 
+		:tenant_info=>tenant_info, 
+		:quotas_origin=>quotas_origin,
+		:quotas_prev=>quotas_prev
+	} %>		
+</div>
+
+<%=erb :comment_list, :locals => {:comment_list=>comment_list} %>
+
+<script type="text/javascript">
+
+$(document).ready(init);
+
+function init(){
+	initReadonly();
+}
+
+function initReadonly(){
+	$('#tenant-opt-dialog input').each(function(i,v){
+		var $field=$(this);
+		$field.attr('readonly', 'true');
+	});
+}
+
+</script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocp_registry
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.5.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,15 +201,22 @@ files:
 - lib/ocp_registry/common.rb
 - lib/ocp_registry/config.rb
 - lib/ocp_registry/db/001_db_initialize.rb
+- lib/ocp_registry/db/002_create_settings_table.rb
+- lib/ocp_registry/db/003_alter_comments_column_in_applications_table.rb
+- lib/ocp_registry/db/004_add_from_field_for_settings.rb
 - lib/ocp_registry/error.rb
 - lib/ocp_registry/mail_client.rb
 - lib/ocp_registry/models.rb
 - lib/ocp_registry/models/registry_application.rb
+- lib/ocp_registry/models/registry_setting.rb
 - lib/ocp_registry/runner.rb
 - lib/ocp_registry/version.rb
 - lib/ocp_registry/yaml_helper.rb
 - mail_template/approve_admin.erb
 - mail_template/approve_user.erb
+- mail_template/cancel_admin.erb
+- mail_template/cancel_user.erb
+- mail_template/modify.erb
 - mail_template/refuse_admin.erb
 - mail_template/refuse_user.erb
 - mail_template/request_admin.erb
@@ -223,12 +230,16 @@ files:
 - public/bootstrap/img/glyphicons-halflings.png
 - public/bootstrap/js/bootstrap.js
 - public/bootstrap/js/bootstrap.min.js
+- public/comment_dialog.css
 - public/common.css
 - public/favicon.ico
+- public/head_message.css
 - public/images/loading.gif
-- public/jquery-1.10.2.min.js
-- public/jquery-1.10.2.min.map
-- public/jquery.json-2.4.min.js
+- public/images/portrait_admin.png
+- public/images/portrait_applicant.png
+- public/jquery/jquery-1.10.2.min.js
+- public/jquery/jquery-1.10.2.min.map
+- public/json/jquery.json-2.4.min.js
 - public/noty/.gitignore
 - public/noty/LICENSE.txt
 - public/noty/README.markdown
@@ -260,11 +271,25 @@ files:
 - public/noty/js/layouts/topRight.js
 - public/noty/js/promise.js
 - public/noty/js/themes/default.js
+- public/page_specific.css
+- public/post.css
+- public/qTIp/jquery.qtip.min.css
+- public/qTIp/jquery.qtip.min.js
+- public/tenant_opt_dialog.css
+- public/tenant_options.css
+- public/util.js
+- spec/spec_common.rb
+- spec/unit/config_spec.rb
+- views/admin_review.erb
+- views/applicant_review.erb
 - views/apply.erb
 - views/base.erb
+- views/comment_list.erb
+- views/inform_comment_dialog.erb
 - views/list.erb
-- views/review.erb
-- views/show.erb
+- views/post.erb
+- views/reject_comment_dialog.erb
+- views/tenant_options.erb
 - views/view.erb
 homepage: ''
 licenses:
@@ -291,4 +316,6 @@ rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: openstack self-registration app
-test_files: []
+test_files:
+- spec/spec_common.rb
+- spec/unit/config_spec.rb