rhosync 2.0.8 → 2.0.9

data/lib/rhosync/console/app/routes/auth.rb

@@ -8,7 +8,7 @@ class RhosyncConsole::Server
       session[:server] = params[:connect] == 'direct' ? nil : params[:server]
       
       #verify_presence_of :server, "Server is not provaided."
-      verify_presence_of :login, "Login is not provaided."
+      verify_presence_of :login, "Login is not provided."
       
       unless session[:errors]         
         session[:token] = RhosyncApi::get_token(session[:server],params[:login],params[:password])

data/lib/rhosync/console/app/routes/client.rb

@@ -17,7 +17,7 @@ class RhosyncConsole::Server
     handle_api_error("Can't load list of sources") do
       @sources = RhosyncApi::list_sources(session[:server],session[:token],:all)
     end
-    erb :client
+    erb :client, :layout => false
   end
   
   get '/device/delete' do

data/lib/rhosync/console/app/routes/docs.rb

@@ -1,74 +1,117 @@
 class RhosyncConsole::Server
-  get '/docs' do
-    @src_params = []
-    handle_api_error("Can't load list of source attributes") do
-      @src_params = RhosyncApi::get_source_params(
-        session[:server],session[:token],params[:source_id])
+  def docs_render_page(contenturl)
+    @currentpage = "Console"
+    @initialcontent = contenturl
+     @pagetitle = "Rhosync Console" #H1 title
+     @locals = {
+       :div => "main_box",
+       :links => [ 
+         { :url => url('/homepage'), :title => 'Info' },
+         { :url => url('/doc/select'), :selected => true, :title => 'Server Document' },
+         { :url => url('/users'), :title => 'Users' }
+       ]
+     }
+     erb :content
+  end
+
+  def hash_to_params(inhash)
+    outstring = "?"
+    inhash.each do |k,v|
+      outstring << "#{k}=#{CGI.escape(v)}&"
     end
-    @docs = []
-    @docs_name = ''
-    @back_href = ''
-    @doc_params = doc_params
-    handle_api_error("Can't load list of the documents") do
-      if params[:device_id]
-        @docs_name = "device #{params[:device_id]}"
-        @back_href = url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}") 
-        @docs = RhosyncApi::list_client_docs(session[:server],session[:token],params[:source_id],params[:device_id])
-      else   
-        if params[:user_id]=='*'      
-          @docs_name = "app partition"
-          @back_href = url('/')
-        else
-           @docs_name = "user #{params[:user_id]} partition"
-           @back_href = url("user?user_id=#{CGI.escape(params[:user_id])}")
-        end   
-        @docs = RhosyncApi::list_source_docs(session[:server],
-          session[:token],params[:source_id],params[:user_id])
-      end    
+    outstring
+  end
+
+  get '/docs' do
+    if params[:xhr] or request.xhr?
+    
+      @src_params = []
+      handle_api_error("Can't load list of source attributes") do
+        @src_params = RhosyncApi::get_source_params(
+          session[:server],session[:token],params[:source_id])
+      end
+      @docs = []
+      @docs_name = ''
+      @back_href = ''
+      @doc_params = doc_params
+      handle_api_error("Can't load list of the documents") do
+        if params[:device_id]
+          @docs_name = "device #{params[:device_id]}"
+          @back_href = url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}") 
+          @docs = RhosyncApi::list_client_docs(session[:server],session[:token],params[:source_id],params[:device_id])
+        else   
+          if params[:user_id]=='*'      
+            @docs_name = "app partition"
+            @back_href = url('/')
+          else
+             @docs_name = "user #{params[:user_id]} partition"
+             @back_href = url("user?user_id=#{CGI.escape(params[:user_id])}")
+          end   
+          @docs = RhosyncApi::list_source_docs(session[:server],
+            session[:token],params[:source_id],params[:user_id])
+        end    
+      end
+      erb :docs, :layout => false
+    else
+      docs_render_page url("/docs" + hash_to_params(params))
+      
     end
-    erb :docs
   end
   
   get '/doc/select' do
-    if params[:dbkey].nil?
-      @dbkey = ''
-      @data = {}
+    if params[:xhr] or request.xhr?
+      if params[:dbkey].nil?
+        @dbkey = ''
+        @data = {}
+      else
+        @dbkey = params[:dbkey]
+        @is_string = doc_is_string      
+        handle_api_error("Can't load document") do
+          @data = RhosyncApi::get_db_doc(session[:server],
+            session[:token],params[:dbkey],@is_string ? :string : '')
+        end
+      end
+      erb :select_doc, :layout => false
     else
-      @dbkey = params[:dbkey]
-      @is_string = doc_is_string      
+      docs_render_page url("/doc/select" + hash_to_params(params))
+    end
+  end
+  
+  get '/doc' do
+    if params[:xhr] or request.xhr?
+    
+      @data = {}
+      @is_string = doc_is_string
       handle_api_error("Can't load document") do
         @data = RhosyncApi::get_db_doc(session[:server],
           session[:token],params[:dbkey],@is_string ? :string : '')
       end
-    end    
-    erb :select_doc
-  end
-  
-  get '/doc' do
-    @data = {}
-    @is_string = doc_is_string
-    handle_api_error("Can't load document") do
-      @data = RhosyncApi::get_db_doc(session[:server],
-        session[:token],params[:dbkey],@is_string ? :string : '')
+      @back_params = "source_id=#{CGI.escape(params[:source_id])}&user_id=#{CGI.escape(params[:user_id])}"
+      @back_params += "&device_id=#{CGI.escape(params[:device_id])}" if params[:device_id] 
+      @back_href = url("docs?#{doc_params}")
+      erb :doc, :layout => false
+    else
+      docs_render_page url("/doc" + hash_to_params(params))
     end
-    @back_params = "source_id=#{CGI.escape(params[:source_id])}&user_id=#{CGI.escape(params[:user_id])}"
-    @back_params += "&device_id=#{CGI.escape(params[:device_id])}" if params[:device_id] 
-    @back_href = url("docs?#{doc_params}")
-    erb :doc  
+        
   end 
   
   get '/doc/clear' do
-    is_string = doc_is_string    
-    handle_api_error("Can't clear document") do
-      RhosyncApi::set_db_doc(session[:server],session[:token],params[:dbkey],
-        is_string ? '' : {}, is_string ? :string : '')
+    if params[:xhr] or request.xhr?
+      is_string = doc_is_string    
+      handle_api_error("Can't clear document") do
+        RhosyncApi::set_db_doc(session[:server],session[:token],params[:dbkey],
+          is_string ? '' : {}, is_string ? :string : '')
+      end
+      @result_name = "Clear result"
+      @status = "Successfully cleared: [#{CGI.unescape(params[:dbkey])}]"
+      @back_href = params[:user_id] ?
+        url("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}") :
+        url("doc/select?dbkey=#{CGI.escape(params[:dbkey])}")     
+      erb :result, :layout => false
+    else
+       docs_render_page url("/doc/clear" + hash_to_params(params))
     end
-    @result_name = "Clear result"
-    @status = "Successfully cleared: [#{CGI.unescape(params[:dbkey])}]"
-    @back_href = params[:user_id] ?
-      url("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}") :
-      url("doc/select?dbkey=#{CGI.escape(params[:dbkey])}")     
-    erb :result
   end
   
   post '/doc/upload' do

data/lib/rhosync/console/app/routes/home.rb

@@ -1,16 +1,55 @@
 class RhosyncConsole::Server
   get '/' do
-    unless login_required
-      @license = nil
-      handle_api_error("Can't get license information") do
-        @license = RhosyncApi::get_license_info(session[:server],session[:token])
+    if params[:xhr] or request.xhr?
+      if login_required
+        redirect url('/loginpage')
+      else
+        redirect url('/homepage')
       end
-      @sources = nil
-      handle_api_error("Can't load list of application partition sources") do
-        @sources = RhosyncApi::list_sources(session[:server],session[:token],:app)
+    else
+      @currentpage = "Console" #which page in menu
+      if login_required
+        @pagetitle = "Login" #H1 title
+        @initialcontent = url('/loginpage')
+
+        @locals = {
+          :div => "main_box",
+          :links => [ 
+          #  { :url => url('/timing/bydevice'), :selected => true, :title => 'By Device' },
+          #  { :url => url('/timing/bysource'), :title => 'By Source' }
+          ]
+        }
+      else
+        @pagetitle = "Rhosync Console" #H1 title
+        @initialcontent = url('/homepage')
+
+        @locals = {
+          :div => "main_box",
+          :links => [ 
+            { :url => url('/homepage'), :selected => true, :title => 'Info' },
+            { :url => url('/doc/select'), :title => 'Server Document' },
+            { :url => url('/users'), :title => 'Users' }
+          ]
+        }
       end
+      erb :content
     end
-    erb :index
+  end
+  
+  get '/loginpage' do
+    erb :login, :layout => :false
+  end
+  
+  get '/homepage' do
+    @license = nil
+    handle_api_error("Can't get license information") do
+      @license = RhosyncApi::get_license_info(session[:server],session[:token])
+    end
+    @sources = nil
+    handle_api_error("Can't load list of application partition sources") do
+      @sources = RhosyncApi::list_sources(session[:server],session[:token],:app)
+    end
+    erb :home, :layout => false
   end
   
   get '/reset' do

data/lib/rhosync/console/app/routes/timing.rb

@@ -0,0 +1,26 @@
+class RhosyncConsole::Server
+  get '/timing' do
+    @currentpage = "Timing"
+    @pagetitle = "Timing" #H1 title
+    
+    @initialcontent = url('/timing/bydevice')
+    
+    @locals = {
+      :div => "main_box",
+      :links => [ 
+        { :url => url('/timing/bydevice'), :selected => true, :title => 'By Device' },
+        { :url => url('/timing/bysource'), :title => 'By Source' }
+      ]
+    }
+    
+    erb :content
+  end
+  
+  get '/timing/bydevice' do
+    "testing device"
+  end
+  
+  get '/timing/bysource' do
+    "testing source<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>"
+  end
+end

data/lib/rhosync/console/app/routes/user.rb

@@ -1,19 +1,44 @@
 class RhosyncConsole::Server
+  def render_page(contenturl)
+    @currentpage = "Console"
+    @initialcontent = contenturl
+     @pagetitle = "Rhosync Console" #H1 title
+     @locals = {
+       :div => "main_box",
+       :links => [ 
+         { :url => url('/homepage'), :title => 'Info' },
+         { :url => url('/doc/select'), :title => 'Server Document' },
+         { :url => url('/users'), :selected => true, :title => 'Users' }
+       ]
+     }
+     erb :content
+  end
+  
   get '/users' do
-    @users = []
-    handle_api_error("Can't load list of users") do
-      @users = RhosyncApi::list_users(session[:server],session[:token])
-    end
-    erb :users
+    if params[:xhr] or request.xhr?
+      @users = []
+      handle_api_error("Can't load list of users") do
+        @users = RhosyncApi::list_users(session[:server],session[:token])
+      end
+      erb :users, :layout => false
+      
+    else
+       render_page url("/users")
+     end 
   end
   
   get '/user/new' do
-    erb :newuser
+    if params[:xhr] or request.xhr?
+      erb :newuser, :layout => false
+    else
+      render_page url("/user/new")
+    end 
+      
   end
   
   post '/user/create' do
     session[:errors] = nil
-    verify_presence_of :login, "Login is not provaided."
+    verify_presence_of :login, "Login is not provided."
     unless session[:errors]             
       handle_api_error("Can't create new user") do  
         RhosyncApi::create_user(session[:server],
@@ -24,16 +49,22 @@ class RhosyncConsole::Server
   end
   
   get '/user' do
-    @devices = []
-    handle_api_error("Can't load list of devices") do
-      @devices = RhosyncApi::list_clients(
-        session[:server],session[:token],params[:user_id])
-    end
-    @sources = []
-    handle_api_error("Can't load list of user partition sources") do
-      @sources = RhosyncApi::list_sources(session[:server],session[:token],:user)
-    end
-    erb :user
+    if params[:xhr] or request.xhr?
+    
+      @devices = []
+      handle_api_error("Can't load list of devices") do
+        @devices = RhosyncApi::list_clients(
+          session[:server],session[:token],params[:user_id])
+      end
+      @sources = []
+      handle_api_error("Can't load list of user partition sources") do
+        @sources = RhosyncApi::list_sources(session[:server],session[:token],:user)
+      end
+      erb :user, :layout => false
+    else
+       params[:user_id] = CGI::escape(params[:user_id]) if params[:user_id]
+       render_page url("/user?user_id=#{params[:user_id]}")
+    end     
   end
   
   get '/user/delete' do
@@ -44,11 +75,17 @@ class RhosyncConsole::Server
   end
   
   get '/user/ping' do
-    @sources = []
-    handle_api_error("Can't load list of user partition sources") do
-      @sources = RhosyncApi::list_sources(session[:server],session[:token],:all)
+    if params[:xhr] or request.xhr?
+    
+      @sources = []
+      handle_api_error("Can't load list of user partition sources") do
+        @sources = RhosyncApi::list_sources(session[:server],session[:token],:all)
+      end
+      erb :ping, :layout => false
+    else
+      render_page url("/user/ping?user_id=#{CGI.escape(params[:user_id])}")
     end
-    erb :ping
+    
   end
   
   post '/user/ping' do

data/lib/rhosync/console/app/views/client.erb

@@ -1,6 +1,6 @@
 <h1>Device: <%=params[:device_id]%></h1>
 <%=show_errors%>
-<a href="<%=url("user?user_id=#{CGI.escape(params[:user_id])}")%>" class='nav_button'>Back</a>
+<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url("user?user_id=#{CGI.escape(params[:user_id])}")%>','main_box');" class='nav_button'>Back</a>
 <a href='<%=url("device/delete?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}")%>' class='nav_button'>
 	Delete device
 </a>
@@ -23,7 +23,7 @@
 
 [
 <%@sources.each_index do |i|%>
-	<a href="<%=url("docs?source_id=#{@sources[i]}&device_id=#{CGI.escape(params[:device_id])}&user_id=#{CGI.escape(params[:user_id])}")%>">
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("docs?source_id=#{@sources[i]}&device_id=#{CGI.escape(params[:device_id])}&user_id=#{CGI.escape(params[:user_id])}")%>','main_box');">
 		<%=i==0?'':','%>"<%=@sources[i]%>"
 	</a>
 <%end%>

data/lib/rhosync/console/app/views/content.erb

@@ -0,0 +1,14 @@
+<h1><%=@pagetitle%></h1>
+
+
+
+<div id="left" >
+		<div class="boxes" id="main_box">
+		</div>
+</div>
+
+<%= erb(:rightboxlinks, :layout => false, :locals => @locals)%>
+
+<script  type="text/javascript">
+	loadXMLDoc('<%= @initialcontent %>','main_box');
+</script>

data/lib/rhosync/console/app/views/docdata.erb

@@ -2,7 +2,7 @@
 <div class='panel'>
 	<%if @data.size > 0%>
 		<div class='panel'>
-			<a href='<%=url("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>' class='nav_button'>Clear document</a>
+			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>','main_box');" class='nav_button'>Clear document</a>
 		</div>
 		<%if @is_string%>
 			<p>[<%=@data%>]</p>

data/lib/rhosync/console/app/views/docs.erb

@@ -1,7 +1,7 @@
 <h1><%=params[:source_id]%></h1>
 <%=show_errors%>
 <div class='panel'>
-	<a href='<%= @back_href%>' class='nav_button'>Back</a>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%= @back_href%>','main_box');" class='nav_button'>Back</a>
 </div>
 <h2>Source attributes</h2>
 <div class='panel'>
@@ -22,7 +22,7 @@
 		<%@docs.each do |name,dbkey|%>
 			<tr>
 				<td>:<%=name%></td>
-				<td><a href='<%=url("doc?dbkey=#{CGI.escape(dbkey)}&#{@doc_params}")%>' class='nav_button'><%=dbkey%></a></td>
+				<td><a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("doc?dbkey=#{CGI.escape(dbkey)}&#{@doc_params}")%>','main_box');" class='nav_button'><%=dbkey%></a></td>
 			</tr>	
 		<%end%>
 	</table>

data/lib/rhosync/console/app/views/headermenu.erb

@@ -0,0 +1,41 @@
+<ul> 
+	<% currentpage = "Console" if currentpage.nil? %>
+	<% if currentpage == "Resque" %>
+		<li id="current"><a href="/resque" class="current">Resque</a></li> 
+	<% else %>
+		<li ><a href="/resque" >Resque</a></li> 
+	<% end %>
+
+	<% if currentpage == "Console" %>
+		<li id="current"><a href="<%=url("")%>" class="current">Console</a></li> 
+	<% else %>
+		<li ><a href="<%=url("")%>" >Console</a></li> 
+	<% end %>
+<!--	
+	<% if currentpage == "Timing" %>
+		<li id="current"><a href="<%=url("timing")%>" class="current">Timing</a></li> 
+	<% else %>
+		<li ><a href="<%=url("timing")%>" class="">Timing</a></li> 
+	<% end %>
+	
+	<% if currentpage == "Storage" %>
+		<li id="current"><a href="/pricing" class="current">Storage</a></li> 
+	<% else %>
+		<li ><a href="/pricing" class="">Storage</a></li> 
+	<% end %>
+
+	<% if currentpage == "Counts" %>
+		<li id="current"><a href="/pricing" class="current">Counts</a></li> 
+	<% else %>
+		<li ><a href="/pricing" class="">Counts</a></li> 
+	<% end %>
+-->
+	<li class="separator"> 
+		<img src="/console/images/tabs_separator.png"/> 
+	</li>
+	<% if session[:token] != nil %> 
+		<li><a href="<%=url("logout")%>" class="logout">Logout</a></li>
+	<% else %>
+		<li><a href="<%=url("")%>" class="login">Login</a></li>
+	<% end %>
+</ul>

data/lib/rhosync/console/app/views/home.erb

@@ -0,0 +1,22 @@
+<%if is_errors? or @sources.nil? %>
+	<%= show_errors%>
+<%end%>
+<%unless @license.nil? %>
+	<%="Licensed to #{@license['licensee']} on #{@license['issued']}, available #{@license['available']} of #{@license['seats']} devices"%>
+<%end%>	
+
+<div class='panel'>
+	<a href="<%=url('reset')%>" class='nav_button' onclick="return confirm('Are you sure? Resetting will remove all data. It will also return an error code to all existing devices when they connect!')">Reset</a>
+	
+</div>
+
+<h2>App partition sources</h2>	
+<div class='panel'>
+	<%unless @sources.nil? %>
+		[
+		<%@sources.each_index do |i|%>
+			<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url("docs?source_id=#{@sources[i]}&user_id=*")%>','main_box');"><%=i==0?'':','%>"<%=@sources[i]%>"</a>
+		<%end%>
+		]
+	<%end%>	
+</div>

data/lib/rhosync/console/app/views/index.erb

@@ -1,5 +1,5 @@
 <%if not login_required %>
-	<h1>Application</h1>
+	<h1>Rhosync Console</h1>
 	<%if is_errors? or @sources.nil? %>
 		<%= show_errors%>
 	<%end%>

data/lib/rhosync/console/app/views/layout.erb

@@ -1,12 +1,87 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Rhosync Console</title>
-  <link rel="stylesheet" href="<%=url('main.css')%>" type="text/css" media="screen" /> 
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>Rhosync Console</title>
+	<!--<link rel="stylesheet" href="<%=url('main.css')%>" type="text/css" media="screen" /> -->
+	<link rel="stylesheet" href="<%=url('reset.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url('home.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url('style.css')%>" type="text/css" media="screen" /> 
+	<link rel="stylesheet" href="<%=url('ThickBox.css')%>" type="text/css" media="screen" /> 
+    <script type="text/javascript">
+
+          function loadXMLDoc(url,id)
+          {
+			if(url.indexOf('?') != -1) {
+				url = url + "&xhr=true";
+			} else {
+				url = url + "?xhr=true";
+			}
+            if (window.XMLHttpRequest)
+            {// code for IE7+, Firefox, Chrome, Opera, Safari
+              xmlhttp=new XMLHttpRequest();
+
+              xmlhttp.open("GET",url,false);
+              xmlhttp.send(null);
+                      if (xmlhttp.responseText != null)
+              {
+                            element = document.getElementById(id);
+                    if (element != null)
+                            {
+                                    element.innerHTML=xmlhttp.responseText;
+                            }
+                      }
+            }
+          }
+
+		function switch_tab(elem)
+		{
+		    if(document.getElementById('link1') != null)document.getElementById('link1').className = "no_class";
+		    if(document.getElementById('link2') != null)document.getElementById('link2').className = "no_class";
+		    if(document.getElementById('link3') != null)document.getElementById('link3').className = "no_class";
+		    if(document.getElementById('link4') != null)document.getElementById('link4').className = "no_class";
+		    if(document.getElementById('link5') != null)document.getElementById('link5').className = "no_class";
+		    if(document.getElementById('link6') != null)document.getElementById('link6').className = "no_class";
+		    if(document.getElementById('link7') != null)document.getElementById('link7').className = "no_class";
+		    document.getElementById(elem).className = "selected";
+		}
+		
+
+    </script>
+
 </head>
-  <body>
-	<%= yield%>
-  <body>
+<body>
+	<div class="container"> 
+		<div class="wrapper"> 
+			<div class="header"> 
+				<div class="logos"> 
+					<a href="" class="logo_rhomobile">RhoMobile</a> 
+					<a href="" class="logo_rhohub">RhoHub</a> 
+				</div> 
+				<div id="menu"> 
+					<%= erb(:headermenu,:layout => false, :locals => {:currentpage => @currentpage})%>
+				</div>
+				<div class="header_landing"> 
+					<div class="col_1"> 
+						<%= yield%>
+					</div><!--END col_1 --> 
+					<div class="land_separator"></div> 
+				</div><!--END header_landing --> 
+				<div style="float:left">
+					<%unless login_required %>
+					<%	license = {}
+					 	handle_api_error("Can't get license information") do
+				       license = RhosyncApi::get_license_info(session[:server],session[:token])
+				      end
+				    %>
+						<%="Licensed to #{license['licensee']}: #{license['available']}/#{license['seats']} devices available"%>
+					<%end%>
+					<br/>Rhosync v<%=Rhosync::VERSION%><br/>
+				</div>
+			</div><!--END header -->
+		</div><!--END wrapper -->
+	</div><!-- END container -->
+	
+</body>
 </html>		

data/lib/rhosync/console/app/views/login.erb

@@ -0,0 +1,26 @@
+<form action="<%=url('login')%>" method='POST'>
+	<table>
+		<tr>
+			<td>Connect to RhoSync:</td>
+			<td>
+				<input type="radio" name="connect" value="direct" 
+					<%= 'checked' if session[:connect] == 'direct' or session[:connect].nil?%>> Directly</input><br>
+				<input type="radio" name="connect" value="remote" <%= 'checked' if session[:connect] == 'remote'%>> Using REST API</input><br>
+			</td>
+		</tr>	
+		<tr>
+			<td>REST Server address:</td>
+			<td><input name='server' value='<%=session[:server_url] || 'http://localhost:9292'%>' size=64/></td>
+		</tr>
+		<tr>
+			<td>Login:</td>
+			<td><input name='login' value='<%=session[:login] || 'rhoadmin'%>'/></td>
+		</tr>
+		<tr>
+			<td>Password:</td>
+			<td><input name='password' type='password' value=''/></td>
+		</tr>
+	</table>
+	<br/>
+	<input type='submit' value='Submit'/>
+</form>

data/lib/rhosync/console/app/views/newuser.erb

@@ -13,5 +13,5 @@
 	</table>
 	<br/>
 	<input type='submit' value='Add'/>
-	<a href="<%=url('users')%>">Back</a>
+	<a href='javascript:void(0);' onclick="loadXMLDoc('<%=url('users')%>','main_box')">Back</a>
 </form>