diff --git a/public/css/create_album.css b/public/css/create_album.css index 1e989e8..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; @@ -1097,7 +1097,7 @@ hr background-size: cover; } -/*------ +/*------ us ------ */ .about-image { @@ -1231,7 +1231,7 @@ hr top: -44px; // 偏移值 display: block; height: 0; - overflow: hidden; + overflow: hidden; }*/ .main-navigation @@ -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; @@ -1639,7 +1638,7 @@ p.profile-description } .book-introduction p { - font-family: '楷体'; + font-family: '微软雅黑'; font-size: 30px; text-align: center; @@ -1755,17 +1754,17 @@ p.profile-description width: 600px; height: 350px; margin-top: 0px; - margin-left: 200px; + margin-left: 20%; padding-top: 8%; padding-left: 8%; - + /* left: 400px; right: 400px;*/ } #book-introduction_description p { - font-family: '楷体';; - font-size: 20px; + font-family: '微软雅黑'; + font-size: 15px; font-weight: bold; color: #666; @@ -1773,8 +1772,8 @@ p.profile-description #book-introduction_description textarea { - font-family: '楷体'; - font-size: 20px; + font-family: '微软雅黑'; + font-size: 15px; font-weight: bold; margin-top: 10px; @@ -1931,12 +1930,12 @@ a:focus }/*light grey*/ .bgcolor-4 { - color: #fff; + color: #fff; background: #2f3238; }/*Dark grey*/ .bgcolor-5 { - color: #521e18; + color: #521e18; background: #df6659; }/*pink1*/ .bgcolor-6 @@ -1949,7 +1948,7 @@ a:focus }/*White tea*/ .bgcolor-8 { - color: #fff; + color: #fff; background: #3d4444; }/*Dark grey2*/ .bgcolor-9 @@ -2067,7 +2066,7 @@ a:focus } .htmleaf-demo a.current { - color: #fff; + color: #fff; background: #1d7db1; } /* Top Navigation Style */ @@ -2268,15 +2267,14 @@ a:focus .book-introduction p, .book-introduction-photo { - font-family: '楷体'; + font-family: '微软雅黑'; } /*书风格的描述,书的风格,主导航栏的字体*/ .book-description, .book-name, .main-navigation { - font-size: 20px; - + font-size: 15px; color: #333; } /*书名,作者,想说的话*/ @@ -2287,7 +2285,7 @@ a:focus /*封面照片*/ .book-cover-picture-p { - font-size: 30px; + font-size: 17px; font-weight: bold; color: #333; @@ -2307,7 +2305,7 @@ a:focus /*编辑本书的简介照片*/ .book-introduction-photo p { - font-size: 20px; + font-size: 15px; margin-top: 10px; margin-left: 50px; diff --git a/public/images/contact_us_word.png b/public/images/contact_us_word.png index 199bb42..a71d68d 100644 Binary files a/public/images/contact_us_word.png and b/public/images/contact_us_word.png differ 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 46aec1a..9d9abd9 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 @@
创建一本时光书
+创建一本时光书
+