More layout crap.

diff --git a/app/components/menu/menu.html b/app/components/menu/menu.html
index 359ba74..60c1188 100644 (file)
--- a/app/components/menu/menu.html
+++ b/app/components/menu/menu.html
@@ -1,3 +1,5 @@
+<img id="floater" src="images/Arrow_Floating.gif" />
+<h1>DivinElegy</h1>
 <ul class="menu">
     <li><a href="#/">Home</a></li>
     <li><a href="#/simfiles">Simfiles</a></li>

diff --git a/app/components/userMenu/userMenu-directive.js b/app/components/userMenu/userMenu-directive.js
index ccfb912..9148889 100644 (file)
--- a/app/components/userMenu/userMenu-directive.js
+++ b/app/components/userMenu/userMenu-directive.js
@@ -21,7 +21,7 @@ directive('userMenu', ['HelloService', 'UserService', function(HelloService, Use
             {
                 UserService.getCurrentUser().then(function(user)
                 {
-                    scope.welcomeMessage = 'Welcome, ' + user.displayName;
+                    scope.welcomeMessage = 'Logged in as ' + user.displayName;
                     scope.quota = user.quota;
                     scope.quotaRemaining = user.quotaRemaining;
                     scope.loggedIn = true;

diff --git a/app/components/userMenu/userMenu.html b/app/components/userMenu/userMenu.html
index f4a8f9c..085633d 100644 (file)
--- a/app/components/userMenu/userMenu.html
+++ b/app/components/userMenu/userMenu.html
@@ -1,30 +1,29 @@
-<div id="usermenu">
+<img id="targets" src="images/Targets.png" />
+<h1 ng-if="loggedIn">Welcome!</h1>
+<h1 ng-if="!loggedIn">Hello!</h1>
+<ul>
+    <li>
+        {{welcomeMessage}}
+        <a class="de-link" ng-if="loggedIn" ng-click="doLogout()">logout</a>
+        <span ng-if="!loggedIn"><a class="de-link" ng-click="doLogin()">Login</a> to access your own control panel.</span>
+    </li>
+</ul>
+<div ng-if="loggedIn">
+    <h1>My Arrows</h1>
     <ul>
-        <li>
-            {{welcomeMessage}}
-            <a class="de-link" ng-if="loggedIn" ng-click="doLogout()">logout</a>
-            <a class="de-link" ng-if="!loggedIn" ng-click="doLogin()">login</a>
-        </li>
+        <li><a href="#/profile">Public Profile</a></li>
+        <li><a href="#/settings">Account Settings</a></li>
     </ul>
-    <div ng-if="loggedIn">
-        <br />
-        <ul>
-            <li>Public Profile</li>
-            <li>Account Settings</li>
-        </ul>
-        <br />
-        <ul>
-            <li>My Uploads</li>
-            <li>My Favourite Files</li>
-            <li>My Favourite Uploaders</li>
-            <li>My Followers</li>
-        </ul>
-        <br />
-        <ul>
-            <li>All Members</li>
-        </ul>
-        <br />
-        <h1>My Quota</h1>
-        {{quotaRemaining}} of {{quota}} remaining
-    </div>
+    <!--<ul>
+        <li>My Uploads</li>
+        <li>My Favourite Files</li>
+        <li>My Favourite Uploaders</li>
+        <li>My Followers</li>
+    </ul>
+    <br />
+    <ul>
+        <li>All Members</li>
+    </ul>-->
+    <h1>My Quota</h1>
+    {{quotaRemaining}} of {{quota}} remaining
 </div>
\ No newline at end of file

diff --git a/app/divinelegy.css b/app/divinelegy.css
index f7a53d2..391c487 100644 (file)
--- a/app/divinelegy.css
+++ b/app/divinelegy.css
@@ -34,6 +34,23 @@ body {
     padding: 7px;
 }
 
+.panel h1 {
+    color: white;
+    font-size: 21px;
+    font-weight: bold;
+    margin: 18px 0px 0px 0px;
+    text-shadow:1px 1px 0 #000,
+    -1px -1px 0 #000,
+    1px -1px 0 #000,
+    -1px 1px 0 #000,
+    0px 1px 0 #000,
+    1px 0px 0 #000,
+    0px -1px 0 #000,
+    -1px 0px 0 #000;
+    -webkit-font-smoothing: antialiased;
+}
+
+
 #navigation,
 #controlPanel {
     margin-top: 60px;
@@ -42,6 +59,21 @@ body {
 #post {
     margin-top: 16px;
 }
+    
+#floater {
+    width: 126px;
+    height: 126px;
+    position: relative;
+    top: -100px;
+    margin-bottom: -116px;
+}
+
+#targets {
+    position: relative;
+    top: -32px;
+    right: 10px;
+    margin-bottom: -40px;
+}
 
 #message-box {
     text-align: center;

diff --git a/app/images/Arrow_Floating.gif b/app/images/Arrow_Floating.gif
new file mode 100644 (file)
index 0000000..b42971f
Binary files /dev/null and b/app/images/Arrow_Floating.gif differ

diff --git a/app/pages/packs/packs.html b/app/pages/packs/packs.html
index fa37d35..a23e27d 100644 (file)
--- a/app/pages/packs/packs.html
+++ b/app/pages/packs/packs.html
@@ -58,7 +58,7 @@ BPM changes: <input type="checkbox" ng-model="bpmChangesFilterKeyword">
         <div class="clearfix"></div>\r
         <h1>Charts</h1>\r
         <accordion>\r
-            <accordion-group class="simfileListing" is-open="isOpen" ng-class="{active: isOpen}" heading="{{simfile.title}}" ng-repeat="simfile in pack.simfiles">\r
+            <accordion-group class="simfileListing" ng-class="{active: isOpen}" heading="{{simfile.title}}" ng-repeat="simfile in pack.simfiles">\r
                 <simfile rock-endpoint="rockEndpoint"\r
                          simfile="simfile"\r
                          banner="simfile.banner"\r

diff --git a/app/pages/packs/packs.js b/app/pages/packs/packs.js
index 99e096f..e38cfa3 100644 (file)
--- a/app/pages/packs/packs.js
+++ b/app/pages/packs/packs.js
@@ -14,7 +14,6 @@ angular.module("DivinElegy.pages.packs", ["DivinElegy.components.simfiles","Divi
     $scope.fgChangesFilterKeyword = null;
     $scope.bgChangesFilterKeyword = null;
     $scope.bpmChangesFilterKeyword = null;
-    $scope.simfileList = [];
     
     var filesizeBytes = function(size)  
     {