From 3d1933b9630c78f5ac15ff6188ab1bd68ea1d227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A1=90=E9=93=AD=20=E6=A2=81?= <werltm@hotmail.com>
Date: Sat, 29 Apr 2017 10:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=94=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App/Admin/views/layout/header/header.cshtml          | 9 +++++----
 .../App/Admin/views/layout/header/headerCtrl.js          | 7 ++-----
 src/YoYo.Cms.Web/App/Admin/views/layout/layout.cshtml    | 4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/YoYo.Cms.Web/App/Admin/views/layout/header/header.cshtml b/src/YoYo.Cms.Web/App/Admin/views/layout/header/header.cshtml
index f646b53..1ff8126 100644
--- a/src/YoYo.Cms.Web/App/Admin/views/layout/header/header.cshtml
+++ b/src/YoYo.Cms.Web/App/Admin/views/layout/header/header.cshtml
@@ -9,13 +9,14 @@
         <div class="al-user-profile" uib-dropdown>
             <a uib-dropdown-toggle class="profile-toggle-link">
                 <img ng-src="{{::( 'Nasta' | profilePicture )}}">
-                <span ng-click="vm.con()">dddd</span>
+                <span ng-bind="vm.getUserName" ></span>
             </a>
             <ul class="top-dropdown-menu profile-dropdown" uib-dropdown-menu>
                 <li><i class="dropdown-arr"></i></li>
-                <li><a ng-click="vm.con()" ><i class="fa fa-user"></i>个人资料</a></li>
-                <li><a data-ng-click="vm.con()" ><i class="fa fa-cog"></i>Settings</a></li>
-                <li><a href class="signout"><i class="fa fa-power-off"></i>Sign out</a></li>
+                @*<li><a ng-click="vm.con()" ><i class="fa fa-user"></i>个人资料</a></li>
+                <li><a ><i class="fa fa-cog"></i>Settings</a></li>*@
+                      
+                <li><a href="@Url.Action("Logout", "Account")" class="signout"><i class="fa fa-power-off"></i>@L("Logout")</a></li>
             </ul>
         </div>
 
diff --git a/src/YoYo.Cms.Web/App/Admin/views/layout/header/headerCtrl.js b/src/YoYo.Cms.Web/App/Admin/views/layout/header/headerCtrl.js
index 78aedf2..7b11eb6 100644
--- a/src/YoYo.Cms.Web/App/Admin/views/layout/header/headerCtrl.js
+++ b/src/YoYo.Cms.Web/App/Admin/views/layout/header/headerCtrl.js
@@ -5,19 +5,16 @@
 
     function header($scope, appSession) {
         var vm = this;
+
         vm.languages = abp.localization.languages;
         vm.currentLanguage = abp.localization.currentLanguage;
-
         vm.changeLanguage = function (languageName) {
             console.log($scope.languages);
-
             location.href = abp.appPath + 'AbpLocalization/ChangeCulture?cultureName=' + languageName + '&returnUrl=' + window.location.pathname + window.location.hash;
         };
 
+        vm.getUserName = appSession.user.userName;
 
-        vm.con = function () {
-            console.log("d");
-        }
 
     }
 
diff --git a/src/YoYo.Cms.Web/App/Admin/views/layout/layout.cshtml b/src/YoYo.Cms.Web/App/Admin/views/layout/layout.cshtml
index db3251d..0d50124 100644
--- a/src/YoYo.Cms.Web/App/Admin/views/layout/layout.cshtml
+++ b/src/YoYo.Cms.Web/App/Admin/views/layout/layout.cshtml
@@ -169,10 +169,10 @@
     </div>
     <footer class="al-footer clearfix">
         <div class="al-footer-right">
-                 Created with <i class="ion-heart"> OurGalaxy Team</i>
+                 Created with <i class="ion-heart">YoYoCms</i>
         </div>
         <div class="al-footer-main clearfix">
-            <div class="al-copy"> © 2017, made with  by OurGalaxy </div>
+            <div class="al-copy"> © @DateTime.Now.Year, made with  by YoYoCms </div>
             <ul class="al-share clearfix">
                 <li><i class="socicon socicon-facebook"></i></li>
                 <li><i class="socicon socicon-twitter"></i></li>