rhoconnect 3.3.1.beta2 → 3.3.1.beta3

data/examples/simple/Gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ../../
+  specs:
+    rhoconnect (3.3.1.beta3)
+      bundler (~> 1.0)
+      json (~> 1.6.0)
+      rake (~> 0.9.2)
+      redis (>= 2.2.0)
+      resque (~> 1.20.0)
+      rest-client (~> 1.6.1)
+      rubyzip (~> 0.9.4)
+      sinatra (~> 1.3)
+      templater (~> 1.0.0)
+      thor (~> 0.15.0)
+      uuidtools (>= 2.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    SystemTimer (1.2.3)
+    async-rack (0.5.1)
+      rack (~> 1.1)
+    daemons (1.1.8)
+    diff-lcs (1.1.2)
+    eventmachine (0.12.10)
+    extlib (0.9.15)
+    highline (1.6.13)
+    json (1.6.7)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
+    rack (1.4.1)
+    rack-fiber_pool (0.9.2)
+    rack-parser (0.1.2)
+      multi_json
+      multi_xml
+      rack
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    redis (2.2.2)
+    redis-namespace (1.0.3)
+      redis (< 3.0.0)
+    resque (1.20.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rhomobile-debug (1.0.6)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyzip (0.9.9)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    templater (1.0.0)
+      diff-lcs (>= 1.1.2)
+      extlib (>= 0.9.5)
+      highline (>= 1.4.0)
+    thin (1.4.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.15.4)
+    tilt (1.3.3)
+    uuidtools (2.1.3)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SystemTimer (~> 1.2.3)
+  async-rack
+  dbd-jdbc (>= 0.1.4)
+  dbi (>= 0.4.5)
+  eventmachine (~> 1.0.0.beta)
+  jdbc-sqlite3 (>= 3.7.2)
+  jruby-openssl (>= 0.7.4)
+  rack-fiber_pool
+  rack-parser
+  rack-test (>= 0.5.3)
+  rhoconnect!
+  rhomobile-debug (>= 1.0.2)
+  rspec (~> 2.6.0)
+  thin
+  trinidad
+  warbler
+  win32-process

data/lib/rhoconnect/api/system/save_adapter.rb

@@ -1,4 +1,4 @@
 Server.api4 :save_adapter, :post, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
           true, {:verb => :post, :url => ['/api/save_adapter', '/api/source/save_adapter']} do |params,user|
-  Rhoconnect.appserver = params[:attributes]['adapter_url'] || params['adapter_url']
+  Rhoconnect.appserver = params['adapter_url'] || params[:attributes]['adapter_url']
 end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.1.beta2'
+  VERSION = '3.3.1.beta3'
 end

data/lib/rhoconnect/web-console/controllers/admins.js

@@ -14,9 +14,8 @@ App.Controllers.Admins = Backbone.Router.extend({
 	  "users/new"			       					:  "new_user",
 	  "user/:id"				   					:  "show_user",
 	  "user/newping/:id"		   					:  "new_ping",
-	  "users/newping"			   					:  "new_ping_all",
+	  "users/newping"		   					    :  "new_ping_all",
 	  "device/:device_id/:user_id" 					:  "user_device",
-	  "change_admin"			   					:  "change_admin",
 	  "stats"					  		  		    :  "stats"
     },
 	        

data/lib/rhoconnect/web-console/models/client.js

@@ -11,6 +11,7 @@ var Client = Backbone.Model.extend({
 	},
 		
 	get_clients: function(user_id){
+		var session = new Session();
 		$.ajax({
 			type: 'get',
 			url: '/rc/v1/users/' + user_id + '/clients',
@@ -37,6 +38,7 @@ var Client = Backbone.Model.extend({
 	},
 	
 	list_client_docs: function(client_id,source_id){
+		var session = new Session();
 		$.ajax({
 			type: 'GET',
 			url: '/rc/v1/clients/' + client_id + '/sources/' + source_id + '/docnames',
@@ -63,6 +65,7 @@ var Client = Backbone.Model.extend({
 	},
 	
 	get_client_params: function(client_id){
+		var session = new Session();
 		$.ajax({
 			type: 'GET',
 			url: '/rc/v1/clients/' + client_id,

data/lib/rhoconnect/web-console/models/doc.js

@@ -47,8 +47,10 @@ var Doc = Backbone.Model.extend({
 				}
 				$('tr.remove-tr-doc').remove();
 				$('#docdata-table tr:last').after(data);
-				$(".query-status")[0].firstChild.className = "label label-success";
-				$(".query-status")[0].firstChild.innerHTML = "success";
+				if($(".query-status")[0] != undefined){
+					$(".query-status")[0].firstChild.className = "label label-success";
+					$(".query-status")[0].firstChild.innerHTML = "success";
+				}
 			},
 			error: function(resp){
 				if(resp.status == 422){

data/lib/rhoconnect/web-console/models/user.js

@@ -11,6 +11,7 @@ var User = Backbone.Model.extend({
 	},
 	
 	get_users: function(tble_name){
+		var session = new Session();
 		var tble_name = tble_name;
 		$.ajax({
 			type: 'GET',
@@ -48,6 +49,7 @@ var User = Backbone.Model.extend({
 	create_user: function(){
 		var login = $('#new-login').val();
 	    var password = $('#new-password').val();
+	    var session = new Session();
 		$.ajax({
 			type: 'POST',
 			url: '/rc/v1/users',
@@ -69,6 +71,7 @@ var User = Backbone.Model.extend({
 	},
 	
 	delete_user: function(){
+		var session = new Session();
 		if(confirm("Are you sure you want to delete this user?")){
 			$.ajax({
 				type: 'DELETE',
@@ -92,6 +95,7 @@ var User = Backbone.Model.extend({
 	},
 	
 	new_ping: function(){
+		var session = new Session();
 		$.ajax({
 			type: 'GET',
 			url: '/rc/v1/sources/type/user',

data/lib/rhoconnect/web-console/templates/index.erb

@@ -27,10 +27,7 @@
 	<script language="javascript" type="text/javascript" src='views/new_user.js'></script>	  	
 	<script language="javascript" type="text/javascript" src='views/show_user.js'></script>	  	
 	<script language="javascript" type="text/javascript" src='views/show_device.js'></script>	  	
-	<script language="javascript" type="text/javascript" src='views/new_ping.js'></script>	  	
-	<script language="javascript" type="text/javascript" src='views/edit_user.js'></script>	  	
-	<script language="javascript" type="text/javascript" src='views/settings.js'></script>	  	
-	<script language="javascript" type="text/javascript" src='views/api_token.js'></script>	  	
+	<script language="javascript" type="text/javascript" src='views/new_ping.js'></script>	
 	<script language="javascript" type="text/javascript" src='views/stats.js'></script>	  	
  	<script language="javascript" type="text/javascript" src='models/session.js'></script>	  	
 	<script language="javascript" type="text/javascript" src='models/source.js'></script>	  	

data/lib/rhoconnect/web-console/views/api_token.js

@@ -1,16 +1,16 @@
-App.Views.ApiToken = Backbone.View.extend({
-	
-    initialize: function() {
-        this.render();
-    },  
-
-    render: function() {
-	    session = new Session()
-        $('#secondary-nav').css('display','block');
-		out = "<h3>API Token</h3>"
-	    out += "<code>"+ session.getApiKey() +"</code>"
-				
-        $(this.el).html(out);
-        $('#settings_main').html(this.el);
-    }
-});
+// App.Views.ApiToken = Backbone.View.extend({
+// 	
+//     initialize: function() {
+//         this.render();
+//     },  
+// 
+//     render: function() {
+// 	    session = new Session()
+//         $('#secondary-nav').css('display','block');
+// 		out = "<h3>API Token</h3>"
+// 	    out += "<code>"+ session.getApiKey() +"</code>"
+// 				
+//         $(this.el).html(out);
+//         $('#settings_main').html(this.el);
+//     }
+// });

data/lib/rhoconnect/web-console/views/doc.js

@@ -47,12 +47,12 @@ App.Views.Doc = Backbone.View.extend({
     
     render: function(dbkey) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><h2>Document&nbsp;"+dbkey+"</h2></div>";
+		out  = "<div class='page-header'><h2>Document&nbsp;"+dbkey+"</h2></div>";
 		out += "<div id='docalert' class='alert alert-error' style='display:none'></div>";
-		out += "<form 'string_s' class='form-horizontal'>";
-		out += "<input type='text' name='data' value='' class='input-xlarge' placeholder='Upload string'/>";
-		out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'>";
-		out += "</form>";
+		//out += "<form 'string_s' class='form-horizontal'>";
+		//out += "<input type='text' name='data' value='' class='input-xlarge' placeholder='Upload string'/>";
+		//out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'>";
+		//out += "</form>";
 		out += "<table id='docdata-table' class='table table-bordered'><tr></tr>";
 		out += "<tr class='remove-tr-doc'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 		out += "</table>"

data/lib/rhoconnect/web-console/views/edit_user.js

@@ -1,46 +1,46 @@
-App.Views.EditUser = Backbone.View.extend({
-	
-	events: {
-		"submit form" : "edit" 
-	},
-	
-    initialize: function() {
-        this.render();
-    },  
-
-    edit: function(e){
-		e.preventDefault();
-	    var session = new Session()
-	    var password = $("#password2").val();
-	  	$.ajax({
-			type: 'PUT',
-			url: '/rc/v1/users/' + 'rhoadmin',
-			data: {attributes : {login : 'rhoadmin', password : password}},
-			beforeSend: function (HttpRequest) {
-			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
-			},
-			success: function(){
-				//router.navigate("users", true);
-			},
-			error: function(resp){
-				if(resp.status == 422){
-					 new App.Views.Index()
-				}
-				$('#settings-alert')[0].innerHTML = resp.responseText;
-		        $('#settings-alert').css('display','block');
-			}
-		})
-	},
-    
-    render: function() {
-        $('#secondary-nav').css('display','block');
-		out = "<h3>Change Admin Password</h3>"
-		out += "<form>"
-	    out += "<input id='password2' type='password' name='password' value='' placeholder='Enter new password' style='margin:0'/>"
-	    out += "<input type='submit' class='btn btn-primary' value='Save' style='margin-left:10px'/>"
-		out += "</form>"
-				
-        $(this.el).html(out);
-        $('#settings_main').html(this.el);
-    }
-});
+// App.Views.EditUser = Backbone.View.extend({
+// 	
+// 	events: {
+// 		"submit form" : "edit" 
+// 	},
+// 	
+//     initialize: function() {
+//         this.render();
+//     },  
+// 
+//     edit: function(e){
+// 		e.preventDefault();
+// 	    var session = new Session()
+// 	    var password = $("#password2").val();
+// 	  	$.ajax({
+// 			type: 'PUT',
+// 			url: '/rc/v1/users/' + 'rhoadmin',
+// 			data: {attributes : {login : 'rhoadmin', password : password}},
+// 			beforeSend: function (HttpRequest) {
+// 			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+// 			},
+// 			success: function(){
+// 				//router.navigate("users", true);
+// 			},
+// 			error: function(resp){
+// 				if(resp.status == 422){
+// 					 new App.Views.Index()
+// 				}
+// 				$('#settings-alert')[0].innerHTML = resp.responseText;
+// 		        $('#settings-alert').css('display','block');
+// 			}
+// 		})
+// 	},
+//     
+//     render: function() {
+//         $('#secondary-nav').css('display','block');
+// 		out = "<h3>Change Admin Password</h3>"
+// 		out += "<form>"
+// 	    out += "<input id='password2' type='password' name='password' value='' placeholder='Enter new password' style='margin:0'/>"
+// 	    out += "<input type='submit' class='btn btn-primary' value='Save' style='margin-left:10px'/>"
+// 		out += "</form>"
+// 				
+//         $(this.el).html(out);
+//         $('#settings_main').html(this.el);
+//     }
+// });

data/lib/rhoconnect/web-console/views/home.js

@@ -4,7 +4,7 @@ App.Views.Home = Backbone.View.extend({
 		"click a#reset"    : "reset",
 		"click #app_url"   : "set_adapter",
 		"submit form"      : "edit",
-		"click #api_btn" : "toggle_api_token"
+		"click #api_btn"   : "toggle_api_token"
 	},
 	
     initialize: function() {
@@ -121,22 +121,7 @@ App.Views.Home = Backbone.View.extend({
 	    out += "<td width='40%'><p style='margin-top:10px'>If you are using <a href='http://docs.rhomobile.com/rhoconnect/plugin-intro' target='_blank'>RhoConnect Plugins</a>, you will need to ";
 	    out += "define your backend app URL either here or in the plugin configuration.  For example, if you are using the rhoconnect-rb plugin in your rails app running locally, use the URL http://localhost:3000. <em><b>This needs to be set in order to use RhoConnect Plugins.</b></em></p></td>"
 	    out += "</table>"
-		
-		out += "<div class='span12' style='margin-top:20px'><h2>Getting Started with RhoConnect</h2>";
-		out += "<ol style='font-size:18px;margin-top:20px'><li>The Home Screen</li>";
-		out += "<ul style='margin:20px'>"
-		out += "<li>Sync Server URL<p style='margin-top:5px'>Use this url in your client application to sync with RhoConnect</p></li>"
-		out += "<li>App partition sources</li><p style='margin-top:5px'>This is a list of all your source adapters partitioned by :app.  Click on the source links to view the attributes and document key/values stored in redis</p>"
-		out += "<li><a class='btn btn-danger'>Reset</a> button</li>"
-		out += "<p style='margin-top:5px'>The reset button will clear the redis db of all data.  <b><em>Be careful when resetting the db as you will lose all your user information and document data!</em></b></p>"
-		out += "</ul>"
-		out += "<li>Server Doc</li>";
-		out += 	"<p style='margin:10px'>Enter a key to view the stored value in the database.  You can also set and delete keys here.</p>"
-		out += "<li>Users</li>"
-		out += "<p style='margin:10px'>View a list of registered users here.  You can also create,delete, and ping users.  Viewing a particular user will allow you to view source adapters partitioned by user as well as that user's registered devices."
-		out += "</ul>"
-		out += "<li>Statistics</li>"
-		out += "<p style='margin-top:10px'>If you do not see a link to Statistics, it is not enabled in your config.ru file.  By default Rhoconnect apps will have this line <code>Rhoconnect::Server.enable  :stats</code> commented out. "
+		out += "<p style='margin-top:10px'>*If Statistics is greyed out, it is not enabled in your config.ru file.  By default Rhoconnect apps will have this line <code>Rhoconnect::Server.enable  :stats</code> commented out. "
 		out += "Older versions of RhoConnect will not have this line in the config.ru file at all.  Uncomment or add the line above to enable Statistics.  The Statistics tab will have different graphs to measure metrics/performance for RhoConnect.</p>"
 		out += "</ol>"
 		out += "<div class='pull-right'>"

data/lib/rhoconnect/web-console/views/new_ping.js

@@ -43,16 +43,21 @@ App.Views.NewPing = Backbone.View.extend({
     
     render: function(name) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><h2>Ping User/s</h2></div>";
+		out  = "<div class='page-header'><h2>Ping User/s</h2></div>";
 		out += "<div id='ping-alert' class='alert alert-error' style='display:none'></div>";
 	    out += "<form><table id='users_table' class='table table-bordered'>";
 	    out += "<input id='pinguser' type='hidden' name='user_id' value='"+name+"' class='input-xlarge' />";
-	    out += "<tr><td>Message:</td><td><input id='pingmessage' type='text' name='message' value='push message' class='input-xlarge' /></td></tr>";
-	    out += "<tr><td>Sources</td><td><input type='text' name='sources' id='sources' value='' class='input-xlarge'/></td></tr>";
-		out += "<tr><td>Sound</td><td><input id='pingsound' type='text' name='badge' value='welcome.mp3' class='input-medium'/></td></tr>";
-		out += "<tr><td>Badge</td><td><input id='pingbadge' type='text' name='badge' value='1' class='input-small'/></td></tr>";
-		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2' class='input-small'/>&nbsp;(seconds)</td></tr>"
-	    out += "<tr><td colspan=2><input type='submit' class='btn btn-primary' value='Ping!' /></td></tr>"
+	    out += "<tr><td>Message:</td><td><input id='pingmessage' type='text' name='message' value='push message' class='input-xlarge' /></td>";
+	    out += "<td>Message to be displayed in push notification</td></tr>"
+	    out += "<tr><td>Sources</td><td><input type='text' name='sources' id='sources' value='' class='input-xlarge'/></td>";
+	    out += "<td>List of sources to be synchronized</td></tr>"
+		out += "<tr><td>Sound</td><td><input id='pingsound' type='text' name='badge' value='welcome.mp3' class='input-medium'/></td>";
+		out += "<td>allows you to play audio file if it exists on client</td></tr>"
+		out += "<tr><td>Badge</td><td><input id='pingbadge' type='text' name='badge' value='1' class='input-small'/></td>";
+		out += "<td>Number displayed on device next to app when push notification arrives. Available for iPhone</td></tr>"
+		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2' class='input-small'/>&nbsp;(seconds)</td>"
+		out += "<td>Duration of vibration when push notification is received</td></tr>"
+	    out += "<tr><td colspan=3><input type='submit' class='btn btn-primary' value='Ping!' /></td></tr>"
 	    out += "</table></form>";
 	   
         $(this.el).html(out);

data/lib/rhoconnect/web-console/views/new_user.js

@@ -15,7 +15,7 @@ App.Views.NewUser = Backbone.View.extend({
     
     render: function() {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><h2>New user</h2></div>";
+		out  = "<div class='page-header'><h2>New user</h2></div>";
 		out += "<div id='newuser-alert' class='alert alert-error' style='display:none'></div>";
 		out += "<form>"
 	    out += "<input id='new-login' type='text' name='login' placeholder='login' style='margin:0'/>";

data/lib/rhoconnect/web-console/views/server_doc.js

@@ -92,15 +92,17 @@ App.Views.ServerDoc = Backbone.View.extend({
     
     render: function(dbkey) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><h2>Document&nbsp;"+dbkey+"</h2></div>";
+		out  = "<div class='page-header'><h2>Document&nbsp;"+dbkey+"</h2>";
+		out += "<p>Enter a document key to view the stored values in redis.  You can also set and delete data here.</p></div>"
 		out += "<div id='docalert' class='alert alert-error' style='display:none'></div>";
+		
 	    out += "<form id='db_key_form' class='form-horizontal'>";
-	    out += "<input id='input_key' type='text' name='dbkey' value='"+dbkey+"' class='input-xlarge' placeholder='Enter DB key'/>";
+	    out += "<input id='input_key' type='text' name='dbkey' value='"+dbkey+"' class='input-xlarge' placeholder='Enter document key'/>";
 	    out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'><div class='query-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div>";
 	    out += "</form>";
-	    if(dbkey != ""){	
+	    if(dbkey != ""){
 			out += "<form id='string_s' class='form-horizontal'>";
-			out += "<input id='data' type='text' name='data' value='' class='input-xlarge' placeholder='Upload String'/>";
+			out += "<input id='data' type='text' name='data' value='' class='input-xlarge' placeholder='Enter document value'/>";
 			out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'><div class='upload-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div>";
 			out += "</form>";
 			out += "<table id='docdata-table' class='table table-bordered'><tr></tr></table>";

data/lib/rhoconnect/web-console/views/settings.js

@@ -1,53 +1,53 @@
-App.Views.Settings = Backbone.View.extend({
-	
-	events: {
-		"click a#change_admin" : "change_admin",
-		"click a#api_token"   : "api_token",
-		"click a#backend_app" : "backend_app"
-	},
-	
-    initialize: function() {
-        this.render();
-		new App.Views.EditUser()
-    },  
-
-	change_admin: function(){
-		this.change_tab('change_admin')
-		new App.Views.EditUser()
-	},
-
-    api_token: function(){
-	this.change_tab('api_token')
-		new App.Views.ApiToken()
-	},
-	
-	backend_app: function(){
-		this.change_tab('backend_app')
-		adapter = new Adapter();
-		new App.Views.SetAdapter({model: adapter })
-	},
-	
-	change_tab: function(tab){
-		$('#change_admin').parent().attr('class','');
-		$('#api_token').parent().attr('class','');
-		$('#backend_app').parent().attr('class','');
-		$('#'+tab).parent().attr('class','active');
-	},
-    
-    render: function() {
-        $('#secondary-nav').css('display','block');
-		out = "<div id='settings-alert' class='alert alert-error' style='display:none'></div>"
-		out += "<div class='tabs-left'><ul class='nav nav-tabs'>"
-		out += "<li class='active'><a id='change_admin'>Change Admin Password</a></li>"
-		out += "<li><a id='api_token'>API Token</a></li>"
-		out += "<li><a id='backend_app'>Plugin Settings</a></li>"
-		out += "</ul>"
-		out += "<div id='settings_main'>"
-		out += "</div>"
-		out += "</div></div>"
-				
-        $(this.el).html(out);
-        $('#main_content').html(this.el);
-		return this
-    }
-});
+// App.Views.Settings = Backbone.View.extend({
+// 	
+// 	events: {
+// 		"click a#change_admin" : "change_admin",
+// 		"click a#api_token"   : "api_token",
+// 		"click a#backend_app" : "backend_app"
+// 	},
+// 	
+//     initialize: function() {
+//         this.render();
+// 		new App.Views.EditUser()
+//     },  
+// 
+// 	change_admin: function(){
+// 		this.change_tab('change_admin')
+// 		new App.Views.EditUser()
+// 	},
+// 
+//     api_token: function(){
+// 	this.change_tab('api_token')
+// 		new App.Views.ApiToken()
+// 	},
+// 	
+// 	backend_app: function(){
+// 		this.change_tab('backend_app')
+// 		adapter = new Adapter();
+// 		new App.Views.SetAdapter({model: adapter })
+// 	},
+// 	
+// 	change_tab: function(tab){
+// 		$('#change_admin').parent().attr('class','');
+// 		$('#api_token').parent().attr('class','');
+// 		$('#backend_app').parent().attr('class','');
+// 		$('#'+tab).parent().attr('class','active');
+// 	},
+//     
+//     render: function() {
+//         $('#secondary-nav').css('display','block');
+// 		out = "<div id='settings-alert' class='alert alert-error' style='display:none'></div>"
+// 		out += "<div class='tabs-left'><ul class='nav nav-tabs'>"
+// 		out += "<li class='active'><a id='change_admin'>Change Admin Password</a></li>"
+// 		out += "<li><a id='api_token'>API Token</a></li>"
+// 		out += "<li><a id='backend_app'>Plugin Settings</a></li>"
+// 		out += "</ul>"
+// 		out += "<div id='settings_main'>"
+// 		out += "</div>"
+// 		out += "</div></div>"
+// 				
+//         $(this.el).html(out);
+//         $('#main_content').html(this.el);
+// 		return this
+//     }
+// });

data/lib/rhoconnect/web-console/views/show_device.js

@@ -44,7 +44,7 @@ App.Views.ShowDevice = Backbone.View.extend({
     
     render: function(device_id) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><span style='font-size:24px;line-height:36px;font-weight:bold'>Device: "+device_id+"</span>";
+		out  = "<div class='page-header'><span style='font-size:24px;line-height:36px;font-weight:bold'>Device: "+device_id+"</span>";
 		out += "<span class='pull-right'><a id='delete-device' class='btn btn-danger'>Delete Device</a></span></div>";
 		out += "<div id='showdevice-alert' class='alert alert-error' style='display:none'></div>";
 	    out += "<table id='deviceattr-table' class='table table-bordered'>";

data/lib/rhoconnect/web-console/views/show_user.js

@@ -10,7 +10,7 @@ App.Views.ShowUser = Backbone.View.extend({
 		client = new Client();
 		client.get_clients(name);
 		source = new Source();
-		source.set('partition_type','user');
+		source.set('partition_type','all');
 		source.set('user_id',name);
 		source.set('doctype','source');
 		source.fetch();
@@ -23,7 +23,7 @@ App.Views.ShowUser = Backbone.View.extend({
     
     render: function(name) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><div style='font-size:24px;font-weight:bold;display:inline'>User: "+name+"</div><div class='pull-right' style='display:inline'>";
+		out  = "<div class='page-header'><div style='font-size:24px;font-weight:bold;display:inline'>User: "+name+"</div><div class='pull-right' style='display:inline'>";
 		out += "<a id='delete-user' class='btn btn-danger'>Delete User</a><a href='#user/newping/"+name+"' class='btn' style='margin-left:10px'>Ping User</a></div></div>";
 		out += "<div id='showuser-alert' class='alert alert-error' style='display:none'></div>";
 	    out += "<table id='source-table' class='table table-bordered'>";

data/lib/rhoconnect/web-console/views/source_docs.js

@@ -18,13 +18,14 @@ App.Views.SourceDocs = Backbone.View.extend({
     
     render: function(source_id) {
         $('#secondary-nav').css('display','block');
-		out  = "<div class='page-header well'><h1>"+source_id+"</h1></div>";
+		out  = "<div class='page-header'><h1>"+source_id+"</h1></div>";
 		out += "<div class='docalert alert-error' style='display:none'></div>";
-	    out += "<table id='sourceparams-table' class='table table-bordered'><thead><tr><th><h3>Attributes</h3></th></tr></thead>";
-	    out += "<tr class='remove-tr-src'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
+	    out += "<table id='sourceparams-table' class='table table-bordered'><thead><tr><th><h3>Attributes</h3></th>";
+	    out += "<td>Attributes for source adapter. <a href='http://docs.rhomobile.com/rhoconnect/source-adapters' target='_blank'>Read more</a></td></tr></thead>"
+	    out += "<tr class='remove-tr-src'><td colspan='2' style='text-align:center'>Loading...</td></tr>";
 		out += "</table>";
-	    out += "<table id='sourcedocs-table' class='table table-bordered'><tr><th class='span5'><h3>Documents</h3></th></tr>";
-	    out += "<tr class='remove-tr-docs'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
+	    out += "<table id='sourcedocs-table' class='table table-bordered'><tr><th class='span5'><h3>Documents</h3></th><td>Redis documents for source adapter. <a href='http://docs.rhomobile.com/rhoconnect/source-adapters#data-partitioning' target='_blank'>Read more</a></td></tr>";
+	    out += "<tr class='remove-tr-docs'><td colspan='2' style='text-align:center'>Loading...</td></tr>";
 	    out += "</table>";
         $(this.el).html(out);
         $('#main_content').html(this.el);