From 283f684e2a14a3ca018d74494645af926d4b650c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E7=81=BF=E6=A1=A2?= <xdzcz@outlook.com>
Date: Sun, 19 Jun 2016 14:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BA=AA=E5=BF=B5=E5=86=8C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/create_album.css            |  9 ++++-----
 public/js/create_album.js              | 10 ++++++++--
 resources/views/create_album.blade.php |  8 +++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/public/css/create_album.css b/public/css/create_album.css
index f21b40b..40ae0a2 100644
--- a/public/css/create_album.css
+++ b/public/css/create_album.css
@@ -614,7 +614,7 @@ Volton Template
 }
 @font-face
 {
-    font-family: 'robotobold';
+    font-family: '微软雅黑';
     font-weight: normal;
     font-style: normal;
 
@@ -1283,9 +1283,8 @@ hr
 
 h3.profile-title
 {
-    font-family: 'robotobold';
-    font-size: 18px;
-
+    font-family: '微软雅黑';
+    font-size: 15px;
     margin-bottom: 5px;
     /*color: white;*/
 
@@ -1293,7 +1292,7 @@ h3.profile-title
 }
 p.profile-description
 {
-    font-family: 'robotobold';
+    font-family: '微软雅黑';
     font-size: 18px;
 
     margin-bottom: 5px;
diff --git a/public/js/create_album.js b/public/js/create_album.js
index d24a8e4..07461c0 100644
--- a/public/js/create_album.js
+++ b/public/js/create_album.js
@@ -103,6 +103,13 @@ yinjiApp.controller('albumController',
 		// });
 
 
+		$scope.userName = "尊敬的";
+
+		$http.get('/getUserName')
+		.success(function(response){
+			$scope.userName += (response + "，您好");
+		});
+
 		//创建纪念册
 		$scope.createAlbum = function () {
 			//输入验证通过
@@ -112,8 +119,7 @@ yinjiApp.controller('albumController',
 			//console.log(ff);
 			//document.getElementById("subBtn").submit();
 			//$("imgForm").submit();
-			
-			
+
 			if ($scope.checkAlbumInput()) {
 				if ($scope.nameOfAuthor == null || $scope.nameOfAuthor == "")
 					//$scope.nameOfAuthor = $_SESSION['userName'];
diff --git a/resources/views/create_album.blade.php b/resources/views/create_album.blade.php
index 707d783..f3bcc5b 100644
--- a/resources/views/create_album.blade.php
+++ b/resources/views/create_album.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.content')
 
-@section('title','生成相簿')
+@section('title','生成纪念册')
 
 @section('header')
 	@parent
@@ -36,8 +36,7 @@
 	                                <img src="/images/create_album/profile.jpg" alt="用户头像">
 	                            </div>
 	                            <div class="profile-content">
-	                                <h3 class="profile-title">用户名字</h3>
-	                                <p class="profile-description">创建一本时光书</p>
+	                                <h3 class="profile-title">　@{{ userName }}</h3>
 	                            </div>
 	                        </div>
 	                    </div>
@@ -60,8 +59,7 @@
             <div class="profile-image">
                 <img src="/images/create_album/profile.jpg" alt="用户头像">
             </div>
-            <h3 class="profile-title">&nbsp;&nbsp;用户名字</h3>
-            <p class="profile-description">&nbsp;创建一本时光书</p>
+            <h3 class="profile-title">@{{ userName }}</h3>
         </div> <!-- 用户头像及用户昵称结束 -->
         <!-- 导航栏 -->
         <div class="main-navigation">