Index: /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/full.html
===================================================================
--- /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/full.html	(revision 10237)
+++ /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/full.html	(revision 10238)
@@ -60,11 +60,24 @@
 						<h1><a href="home.html">Nigerian Research and<br/>Education Network</a></h1>
 					</div>
-					<div id="user-options">
-						<ul>
-							<li><a href="example.html">Login</a></li>
-							<li><span class="separator">|</span></li>
-							<li><a href="example.html">Register</a></li>
-						</ul>
-					</div>
+                                        <div class="btn-group pull-right btn-small"
+                                             id="user-options">
+                                          <a class="btn btn-small btn-primary"
+                                             href="#">
+                                            <i class="icon-user icon-white"></i>
+                                            <span id="user-options-name">
+                                              Username
+                                            </span>
+                                          </a>
+                                          <a class="btn btn-small btn-primary
+                                                    dropdown-toggle"
+                                             data-toggle="dropdown"
+                                             href="#">
+                                            <span class="caret"></span>
+                                          </a>
+                                          <ul class="dropdown-menu btn-small">
+                                            <li><a href="#">Dashboard</a></li>
+                                            <li><a href="#">Logout</a></li>
+                                          </ul>
+                                        </div><!-- user-options -->
 					<form class="navbar-form pull-right">
 						<input type="text" />
Index: /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/rules.xml
===================================================================
--- /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/rules.xml	(revision 10237)
+++ /main/ngren.theme/branches/ulif-user-dropdown/ngren/theme/ngren_theme/rules.xml	(revision 10238)
@@ -28,14 +28,26 @@
     
     
-	<!-- Top / Header -->
-	<copy attributes="href" css:content='#portal-logo' css:theme="#logo-container a" />
+    <!-- Top / Header -->
+    <copy attributes="href" css:content='#portal-logo' css:theme="#logo-container a" />
 
-	<copy css:theme="#user-options ul">
-		<xsl:for-each css:select="#portal-personaltools li">
-                <xsl:if test="not(position()=last())">
-						<xsl:copy-of select="." />
-                </xsl:if>
-        </xsl:for-each> 
-	</copy>
+    <!-- User options (upper right) -->
+    <!--      user name in options menu   -->
+    <replace css:theme-children="#user-options-name"
+             css:content-children="#portal-personaltools li:nth-child(1) a" />
+
+    <!--      href of username link -->
+    <copy attributes="href"
+          css:content="#portal-personaltools li:nth-child(1) a"
+          css:theme="#user-options a:nth-child(1)" />
+    <!--      2nd to last link of user options (separators filtered out) -->
+    <copy css:theme="#user-options ul">
+      <xsl:for-each css:select="#portal-personaltools li">
+        <xsl:if test="not(position() mod 2 = 0)">
+          <xsl:if test="not(position() = 1)">
+            <xsl:copy-of select="." />
+          </xsl:if>
+        </xsl:if>
+      </xsl:for-each>
+    </copy>
 	
 	<replace css:theme=".navbar-form" css:content="#portal-searchbox form"/>
