Changeset 37 for trunk/grails-app/views

Timestamp:

Oct 29, 2009, 2:01:32 PM (14 years ago)

Author:

duh

Message:

• installed and implemented nimble plugin
• setup basic nimble integration
• updated menu with administrative functions (log in as admin)
• two users (admin and user) --> see NimbleBootstrap?.groovy
• some nimble templates still need to be fixed, however most functionality should work properly

Location:

trunk/grails-app/views

Files:

• common/_login_panel.gsp (modified) (2 diffs)
• common/_topnav.gsp (modified) (1 diff)
• index.gsp (modified) (1 diff)
• layouts/main.gsp (modified) (1 diff)
• templates (added)
• templates/nimble (added)
• templates/nimble/help (added)
• templates/nimble/help/_accountcreationpolicy.gsp (added)
• templates/nimble/help/_passwordpolicy.gsp (added)
• templates/nimble/help/_usernamepolicy.gsp (added)
• templates/nimble/login (added)
• templates/nimble/login/_login.gsp (added)
• templates/nimble/mail (added)
• templates/nimble/mail/_accountregistration_email.gsp (added)
• templates/nimble/mail/_emailchange_email.gsp (added)
• templates/nimble/mail/_forgottenpassword_email.gsp (added)
• templates/nimble/mail/_forgottenpassword_external_email.gsp (added)
• templates/nimble/navigation (added)
• templates/nimble/navigation/_topnavigation.gsp (added)
• templates/nimble/profile (added)
• templates/nimble/profile/_banner.gsp (added)
• templates/nimble/profile/_currentstatus.gsp (added)
• templates/nimble/profile/_emailupdated.gsp (added)
• templates/nimble/profile/_left.gsp (added)
• templates/nimble/profile/_miniprofile.gsp (added)
• templates/nimble/profile/_socialmedia.gsp (added)

trunk/grails-app/views/common/_login_panel.gsp

@@ -11 +11 @@
                         </div>
                         <div class="left">
-                                <g:form url="[action:'signIn',controller:'auth']" class="clearfix">
+                                <g:form url="[action:'signin',controller:'auth']" class="clearfix">
                                         <input type="hidden" name="targetUri" value="${targetUri}" />
                                         <h1>Member Login</h1>
@@ -41 +41 @@
                 <ul class="login">
                         <li class="left">&nbsp;</li>    
-                        <li>Hello <jsec:isLoggedIn><jsec:principal/></jsec:isLoggedIn><jsec:isNotLoggedIn>Guest</jsec:isNotLoggedIn>!</li>
+                        <li>Hello <n:isLoggedIn><n:principal/></n:isLoggedIn><n:isNotLoggedIn>Guest</n:isNotLoggedIn>!</li>
                         <li class="sep">|</li>
                         <li id="toggle">
-<!--                            <jsec:isLoggedIn><g:link controller="auth" action="signOut">sign out</g:link></jsec:isLoggedIn> //-->
-                                <jsec:isNotLoggedIn>
+                                <n:isLoggedIn><g:link controller="auth" action="signout">sign out</g:link></n:isLoggedIn>
+                                <n:isNotLoggedIn>
                                  <a id="open" class="open" href="#">Log In | Register</a>
                                  <a id="close" style="display: none;" class="close" href="#">Close Panel</a>                    
-                                </jsec:isNotLoggedIn>
+                                </n:isNotLoggedIn>
                         </li>
             <li class="right">&nbsp;</li>

trunk/grails-app/views/common/_topnav.gsp

@@ -9 +9 @@
         </ul>
       </li>
+<n:isAdministrator>
+      <li>
+        <a href="#">User administation</a>
+        <ul class="subnav">
+          <li><g:link controller="admins" action="index" class="icon icon_user_suit">Manage Administrators</g:link></li>
+          <li><g:link controller="user" action="list" class="icon icon_user">List Users</g:link></li>
+          <li><g:link controller="user" action="create" class="icon icon_user_add">Create User</g:link></li>
+          <li><g:link controller="role" action="list" class="icon icon_cog">List Roles</g:link></li>
+          <li><g:link controller="role" action="create" class="icon icon_cog_add">Create Role</g:link></li>
+          <li><g:link controller="group" action="list" class="icon icon_group">List Groups</g:link></li>
+          <li><g:link controller="group" action="create" class="icon icon_group_add">Create Group</g:link></li>
+          <li><g:link controller="auth" action="logout" class="icon icon_cross">Sign out</g:link></li>
+        </ul>
+      </li>
+</n:isAdministrator>
     </ul>
     <!-- /TOPNAV //-->

trunk/grails-app/views/index.gsp

@@ -29 +29 @@
         <p><a href="<g:createLink url="[action:'create',controller:'query']"/>">Create advanced query</a></p>
         <p>
-        <jsec:isNotLoggedIn>
+        <n:isNotLoggedIn>
         <small>To query private studies, please login above.</small>
-        </jsec:isNotLoggedIn>
+        </n:isNotLoggedIn>
         </p>
       </div>
       <div id="tab-add">
-        <jsec:isNotLoggedIn>
+        <n:isNotLoggedIn>
         To add or change study data, please login above.
-        </jsec:isNotLoggedIn>
+        </n:isNotLoggedIn>
       </div>
     </div>

trunk/grails-app/views/layouts/main.gsp

@@ -7 +7 @@
   <link rel="stylesheet" href="${resource(dir:'css',file:'login_panel.css')}" />
   <link rel="shortcut icon" href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
+  <g:javascript library="jquery" />
   <g:layoutHead />
-  <g:javascript library="jquery" />
-  <g:javascript library="login_panel" />
-  <g:javascript library="topnav" />
+  <g:javascript src="login_panel.js" />
+  <g:javascript src="topnav.js" />
  </head>
  <body>