Merge branch 'master' of github.com:summerblue/phphub5

* 'master' of github.com:summerblue/phphub5: update new topic text fixing topic created twice problem
od3n · Aug 5, 2016 · 3866222 · 3866222
2 parents 666acb2 + 4a67628
commit 3866222
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/public/build/assets/js/scripts-07c1bff1d2.js → public/build/assets/js/scripts-707398ded8.js b/public/build/assets/js/scripts-07c1bff1d2.js → public/build/assets/js/scripts-707398ded8.js
diff --git a/public/build/assets/js/scripts.js.map b/public/build/assets/js/scripts.js.map
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
  "assets/css/styles.css": "assets/css/styles-b10978ee14.css",
- "assets/js/scripts.js": "assets/js/scripts-07c1bff1d2.js"
+ "assets/js/scripts.js": "assets/js/scripts-707398ded8.js"
 }
diff --git a/resources/assets/js/main.js b/resources/assets/js/main.js
@@ -373,6 +373,9 @@
  $("#topic-create-form").submit(function(event){
  localforage.removeItem('topic_create_content');
  localforage.removeItem('topic-title');
+
+ $("#topic-create-submit").val('提交中...').addClass('disabled').prop('disabled', true);
+
  });
  $("#reply-form").submit(function(event){
  localforage.removeItem('reply_content');

diff --git a/resources/lang/zh-CN/phphub.php b/resources/lang/zh-CN/phphub.php
@@ -12,7 +12,7 @@
  'Search' => '搜索',
  'Login' => '登 录',
  'Logout' => '退出',
- 'New Topic' => '发 布 新 帖',
+ 'New Topic' => ' 新 建 话 题',
  'Links' => '友情社区',
  'Same Category Topics' => '分类下其他主题',
  'Tips and Tricks' => '小贴士',

diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
@@ -14,7 +14,7 @@
  <a href="
  {{ isset($category) ? URL::route('topics.create', ['category_id' => $category->id]) : URL::route('topics.create') }}
  " class="btn btn-primary btn-lg">
- <i class="glyphicon glyphicon-pencil"> </i> {{ lang('New Topic') }}
+ <i class="fa fa-paint-brush" aria-hidden="true"></i> {{ lang('New Topic') }}
  </a>
  </div>
  </div>

diff --git a/resources/views/topics/show.blade.php b/resources/views/topics/show.blade.php
@@ -144,7 +144,7 @@ class="vote btn btn-primary {{ $currentUser && $topic->votes()->ByWhom(Auth::id(
  </div>
 
  <div class="form-group status-post-submit">
- <input class="btn btn-primary {{ $currentUser ? :'disabled'}}" id="reply-create-submit" type="submit" value="{{ lang('Reply') }}">
+ <input class="btn btn-primary {{ $currentUser ? '' :'disabled'}}" id="reply-create-submit" type="submit" value="{{ lang('Reply') }}">
  <span class="help-inline" title="Or Command + Enter">Ctrl+Enter</span>
  </div>