Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/zcz-GitHub/Yinji into de…
Browse files Browse the repository at this point in the history 
…velop
  • Loading branch information
@xx502003587
xx502003587 committed Jun 19, 2016
2 parents b99d999 + a3bdf22 commit 4abe709
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 52 deletions.
44 changes: 21 additions & 23 deletions public/css/create_album.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ Volton Template
}
@font-face
{
font-family: 'robotobold';
font-family: '微软雅黑';
font-weight: normal;
font-style: normal;

Expand Down Expand Up @@ -1097,7 +1097,7 @@ hr
background-size: cover;
}

/*------
/*------
us ------ */
.about-image
{
Expand Down Expand Up @@ -1231,7 +1231,7 @@ hr
top: -44px; // 偏移值
display: block;
height: 0;
overflow: hidden;
overflow: hidden;
}*/

.main-navigation
Expand Down Expand Up @@ -1283,17 +1283,16 @@ hr

h3.profile-title
{
font-family: 'robotobold';
font-size: 18px;

font-family: '微软雅黑';
font-size: 15px;
margin-bottom: 5px;
/*color: white;*/

color: #333;
}
p.profile-description
{
font-family: 'robotobold';
font-family: '微软雅黑';
font-size: 18px;

margin-bottom: 5px;
Expand Down Expand Up @@ -1639,7 +1638,7 @@ p.profile-description
}
.book-introduction p
{
font-family: '楷体';
font-family: '微软雅黑';
font-size: 30px;

text-align: center;
Expand Down Expand Up @@ -1755,26 +1754,26 @@ 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;
}

#book-introduction_description textarea
{
font-family: '楷体';
font-size: 20px;
font-family: '微软雅黑';
font-size: 15px;
font-weight: bold;

margin-top: 10px;
Expand Down Expand Up @@ -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
Expand All @@ -1949,7 +1948,7 @@ a:focus
}/*White tea*/
.bgcolor-8
{
color: #fff;
color: #fff;
background: #3d4444;
}/*Dark grey2*/
.bgcolor-9
Expand Down Expand Up @@ -2067,7 +2066,7 @@ a:focus
}
.htmleaf-demo a.current
{
color: #fff;
color: #fff;
background: #1d7db1;
}
/* Top Navigation Style */
Expand Down Expand Up @@ -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;
}
/*书名，作者，想说的话*/
Expand All @@ -2287,7 +2285,7 @@ a:focus
/*封面照片*/
.book-cover-picture-p
{
font-size: 30px;
font-size: 17px;
font-weight: bold;

color: #333;
Expand All @@ -2307,7 +2305,7 @@ a:focus
/*编辑本书的简介照片*/
.book-introduction-photo p
{
font-size: 20px;
font-size: 15px;

margin-top: 10px;
margin-left: 50px;
Expand Down
Binary file modified public/images/contact_us_word.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 8 additions & 2 deletions public/js/create_album.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ yinjiApp.controller('albumController',
// });


$scope.userName = "尊敬的";

$http.get('/getUserName')
.success(function(response){
$scope.userName += (response + "，您好");
});

//创建纪念册
$scope.createAlbum = function () {
//输入验证通过
Expand All @@ -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'];
Expand Down
36 changes: 12 additions & 24 deletions resources/views/create_album.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@extends('layouts.content')

@section('title','生成相簿')
@section('title','生成纪念册')

@section('header')
@parent
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -74,15 +72,12 @@
</div> <!-- 创建纪念册右边导航栏结束 -->

<!-- 纪念册风格 -->
<div class="banner-bg" id="top">
<div class="book-style-text">
<p>快为你的纪念册选一个风格吧：</p>
</div>
<div class="banner-bg" id="top" style="padding-top:20px;">
<div class="book-style-picture">
<div class="book-style">
<p class="book-name"><strong>亲亲宝贝</strong></p>
<p class="book-description">记录宝贝成长的点滴</p>
<img class = "noBorder" id = "img1_baby" src="/images/create_album/baby.jpg" alt="亲子记录"
<img class = "noBorder" id="img1_baby" src="/images/create_album/baby.jpg" alt="亲子记录"
onclick="changecolor(this.id,1)">
</div>

Expand Down Expand Up @@ -131,13 +126,9 @@
<div class="content-wrapper">

<!-- 封面设计 -->
<div class="page-section" id="about">
<div class="page-section" id="about" style="padding-top:20px;">
<div class="row">
<div class="cover-design">
<div class="design-title-text">
<p class="design-title">快来设计你的封面吧：</p>
</div>

<!-- 输入框模板模板 -->
<div class="container-album">
<section class="content bgcolor-1">
Expand Down Expand Up @@ -178,7 +169,7 @@
<input type = "submit" id = "subBtn" hidden>
<input type="file" name="fileUpload[]" id="doc1" style="width:500px;" class="inputfile inputfile-1" onchange="javascript:setImagePreview1();" data-multiple-caption="{count} files selected" multiple="multiple" />

<label for="doc1"><svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17"><path d="M10 0l-5.2 4.9h3.3v5.1h3.8v-5.1h3.3l-5.2-4.9zm9.3 11.5l-3.2-2.1h-2l3.4 2.6h-3.5c-.1 0-.2.1-.2.1l-.8 2.3h-6l-.8-2.2c-.1-.1-.1-.2-.2-.2h-3.6l3.4-2.6h-2l-3.2 2.1c-.4.3-.7 1-.6 1.5l.6 3.1c.1.5.7.9 1.2.9h16.3c.6 0 1.1-.4 1.3-.9l.6-3.1c.1-.5-.2-1.2-.7-1.5z"/></svg> <span>选择本地图片&hellip;</span></label>
<label for="doc1"><svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17"><path d="M10 0l-5.2 4.9h3.3v5.1h3.8v-5.1h3.3l-5.2-4.9zm9.3 11.5l-3.2-2.1h-2l3.4 2.6h-3.5c-.1 0-.2.1-.2.1l-.8 2.3h-6l-.8-2.2c-.1-.1-.1-.2-.2-.2h-3.6l3.4-2.6h-2l-3.2 2.1c-.4.3-.7 1-.6 1.5l.6 3.1c.1.5.7.9 1.2.9h16.3c.6 0 1.1-.4 1.3-.9l.6-3.1c.1-.5-.2-1.2-.7-1.5z"/></svg> <span style="font-size:16px;">选择本地图片&hellip;</span></label>
</td>
</tr>
</tbody>
Expand All @@ -190,14 +181,11 @@
</div>

<!-- 填写简介 -->
<div class="page-section" id="projects">
<div class="book-introduction">
<p>快来为你的纪念册写简介吧：</p>
</div>
<div class="page-section" id="projects" style="padding-top:50px;">
<div class="book-introduction-photo">


<!-- 上传简介照片

<!-- 上传简介照片
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
Expand All @@ -218,7 +206,7 @@
</table>-->
<!-- 填写简介 -->
<div id="book-introduction_description">
<p>填写纪念册内容简介:</p>
<p>纪念册简介:</p>
<!-- <textarea name="description" id="description" rows="10" cols="50" wrap="hard"></textarea> -->
<!-- <form role="form"> -->
<div class="form-group">
Expand All @@ -233,7 +221,7 @@
<!-- <input type = "button" value = "保存" onclick="saveChange()">
<input type = "button" value = "删除" onclick="deleteAlbum()"> -->

<input class="button button-3d button-box button-jumbo" type="submit" value="提交">
<input class="btn btn-lg" type="submit" style="font-family:'微软雅黑';font-size:15px;" value="提交">
<!-- <a href="/home" class="button button-raised button-primary button-pill">Visit Us!</a> -->
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions resources/views/create_records/album_records.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@

@section('content')
<div ng-controller="checkRecordCtrl">
<p ng-show="!ifShow" style="padding-left: 15%;padding-top:3%;font-family: 黑体;font-size:15px;">
您目前还没有任何记录哦，单击<a href="/album_create_records">添加</a>，添加您的第一条记录吧~
</p>
<div class="mydiv111" ng-repeat="x in records| orderBy:'showTime':true">
<p class="datep" ng-bind="x.showTime"></p>
<p class="diary" ng-bind="x.description"></p>
<p name="comPath"></p>
<p ng-show="!ifShow" style="padding-left: 15%;padding-top:3%;">
您目前还没有任何记录哦，单击<a href="/album_create_records">添加</a>，添加您的第一条记录吧~
</p>

<div class="divpic">
<div ng-repeat="y in x.arr_path">
<img class="mypic" src="@{{y}}" name="imgview" onload="DrawImage(this);"/>
Expand Down

0 comments on commit 4abe709

Please sign in to comment.