Mercurial > public > src > rhodecode

changeset 917:fcf8788886ce demo

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for demo versions
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 18 Dec 2010 15:41:42 +0100
parents be73a4d29672
children 2198a3c6f7d5
files rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/users.py rhodecode/controllers/settings.py rhodecode/templates/login.html
diffstat 4 files changed, 35 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py	Sat Dec 18 15:07:16 2010 +0100
+++ b/rhodecode/controllers/admin/repos.py	Sat Dec 18 15:41:42 2010 +0100
@@ -187,7 +187,7 @@
         #           method='delete')
         # url('repo', repo_name=ID)
 
-        h.flash(_('deleted repository %s  - disabled for demo :)') 
+        h.flash(_('deleted repository %s  [no effect in demo]')
                 % repo_name, category='success')
         return redirect(url('repos'))
 
@@ -226,7 +226,7 @@
             repo_model = RepoModel()
             repo_model.delete_perm_user(request.POST, repo_name)
         except Exception, e:
-            h.flash(_('An error occured during deletion of repository user'),
+            h.flash(_('An error occurred during deletion of repository user'),
                     category='error')
             raise HTTPInternalServerError()
 
@@ -248,7 +248,7 @@
     @HasPermissionAllDecorator('hg.admin')
     def repo_cache(self, repo_name):
         """
-        INVALIDATE exisitings repository cache
+        INVALIDATE existing repository cache
         :param repo_name:
         """
 
--- a/rhodecode/controllers/admin/users.py	Sat Dec 18 15:07:16 2010 +0100
+++ b/rhodecode/controllers/admin/users.py	Sat Dec 18 15:41:42 2010 +0100
@@ -137,16 +137,19 @@
         #    h.form(url('user', id=ID),
         #           method='delete')
         # url('user', id=ID)
-        h.flash(_('sucessfully deleted user - disabled for demo :)'), category='success')
+
+        h.flash(_('successfully deleted user [no effect in demo]'),
+                category='success')
         return redirect(url('users'))
+
         user_model = UserModel()
         try:
             user_model.delete(id)
-            h.flash(_('sucessfully deleted user'), category='success')
+            h.flash(_('successfully deleted user'), category='success')
         except (UserOwnsReposException, DefaultUserException), e:
             h.flash(str(e), category='warning')
         except Exception:
-            h.flash(_('An error occured during deletion of user'),
+            h.flash(_('An error occurred during deletion of user'),
                     category='error')
         return redirect(url('users'))
 
--- a/rhodecode/controllers/settings.py	Sat Dec 18 15:07:16 2010 +0100
+++ b/rhodecode/controllers/settings.py	Sat Dec 18 15:41:42 2010 +0100
@@ -112,6 +112,10 @@
         #           method='delete')
         # url('repo_settings_delete', repo_name=ID)
 
+        h.flash(_('deleted repository %s  [no effect in demo]')
+                % repo_name, category='success')
+        return redirect(url('repos'))
+
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
--- a/rhodecode/templates/login.html	Sat Dec 18 15:07:16 2010 +0100
+++ b/rhodecode/templates/login.html	Sat Dec 18 15:41:42 2010 +0100
@@ -66,18 +66,28 @@
                 ${h.end_form()}
             </div>
             <!-- end login -->
-        <p style="background-color: #fff;padding: 3px">    
-        Welcome to RhodeCode demo version. For better user experience deleting users,user updates and deletion of repos is turned
-        off. You can do pulls/pushes thru the demo app as you wish. You can
-        create repositories, and users. All permissions management is also available. 
-        <br/><b>If you want to create new user do it ${h.link_to(_("here"),h.url('register'))}</b>
-        or use <br/><b>login:demo</b>, <br/><b>password:demo</b> <br/>for admin account.
-        <br/>
-        All feedback pls send to:<br/>
-        <a href="http://www.bitbucket.org/marcinkuzminski/rhodecode/issues">
-            http://www.bitbucket.org/marcinkuzminski/rhodecode/issues
-        </a>           
-        </p>
+            <br/>
+	        <div style="border: 1px solid #003367;padding:10px;background-color: #fff "  class="top-left-rounded-corner bottom-right-rounded-corner bottom-left-rounded-corner top-right-rounded-corner">   
+		         
+		        <h4>Welcome to RhodeCode demo version.</h4> 
+		        <br/>
+		        Default login for an administrative account is:<br/>
+		        <b>login:demo</b> <br/>
+		        <b>password:demo</b> <br/>
+		        <br/>
+		        
+		        For better user experience deleting,updating users, and deletion of repos is turned
+		        off. You can do pulls/pushes thru the demo app as you wish. You can
+		        create repositories, and users. All permissions management is also available. 
+		        <br/><b>If you want to create new user do it ${h.link_to(_("here"),h.url('register'))}</b>
+		        <br/>
+		        <br/>
+		        Report feedback and issues to: <br/>
+		        <a href="http://www.bitbucket.org/marcinkuzminski/rhodecode/issues">
+		            http://www.bitbucket.org/marcinkuzminski/rhodecode/issues
+		        </a>           
+		        
+	        </div>
         </div>
     </body>
 </html>