Просмотр исходного кода

config の状態によって出しワケ

Sotaro KARASAWA 11 лет назад
Родитель
Сommit
3077749f41
4 измененных файлов с 21 добавлено и 1 удалено
  1. 7 0
      lib/swigFunctions.js
  2. 0 1
      models/config.js
  3. 8 0
      views/login.html
  4. 6 0
      views/me/index.html

+ 7 - 0
lib/swigFunctions.js

@@ -3,9 +3,16 @@ module.exports = function(app) {
     , models = app.set('models')
     , Page = models.Page
     , User = models.User
+    , config = app.set('config')
   ;
 
   return {
+    facebookLoginEnabled: function() {
+      return config.crowi['facebook:appId'] && config.crowi['facebook:secret'];
+    },
+    googleLoginEnabled: function() {
+      return config.crowi['google:clientId'] && config.crowi['google:clientSecret'];
+    },
     user_page_root: function(user) {
       if (!user) {
         return '';

+ 0 - 1
models/config.js

@@ -135,7 +135,6 @@ module.exports = function(app) {
           config[el.ns][el.key] = JSON.parse(el.value);
         });
 
-        debug("config data", config);
         return callback(null, config);
       });
   };

+ 8 - 0
views/login.html

@@ -55,18 +55,22 @@
     <hr>
 
     <div class="row">
+      {% if googleLoginEnabled() %}
       <div class="col-md-6">
         <p>Google でログイン</p>
         <form role="form" action="/login/google" method="get">
           <button type="submit" class="btn btn-block btn-google"><i class="fa fa-google-plus-square"></i> Login</button>
         </form>
       </div>
+      {% endif %}
+      {% if facebookLoginEnabled() %}
       <div class="col-md-6">
         <p>Facebook でログイン</p>
         <form role="form">
           <button type="button" id="btn-login-facebook" class="btn btn-block btn-facebook"><i class="fa fa-facebook-square"></i> Login</button>
         </form>
       </div>
+      {% endif %}
     </div>
 
     {% if config.security.registrationMode != 'Closed' %}
@@ -165,18 +169,22 @@
     <hr>
 
     <div class="row">
+      {% if googleLoginEnabled() %}
       <div class="col-md-6">
         <p>Google で登録</p>
         <form role="form" method="post" action="/register/google">
           <button type="submit" class="btn btn-block btn-google"><i class="fa fa-google-plus-square"></i> Login</button>
         </form>
       </div>
+      {% endif %}
+      {% if facebookLoginEnabled() %}
       <div class="col-md-6">
         <p>Facebook で登録</p>
         <form role="form">
           <button type="button" id="btn-register-facebook" class="btn btn-block btn-facebook"><i class="fa fa-facebook-square"></i> Login</button>
         </form>
       </div>
+      {% endif %}
     </div>
 
     <p class="bottom-text"><a href="#login" onclick="$('#login-dialog').removeClass('to-flip'); return false;"><i class="fa fa-sign-out"></i> ログインはこちら</a></p>

+ 6 - 0
views/me/index.html

@@ -165,6 +165,7 @@
     </script>
 
   <div class="row">
+    {% if facebookLoginEnabled() %}
     <div class="col-sm-6"> {# Facebook Connect #}
 
       <div class="form-box">
@@ -233,6 +234,9 @@
         </form>
     </div> {# /Facebook Connect #}
 
+    {% endif %}
+    {% if googleLoginEnabled() %}
+
     <div class="col-sm-6"> {# Google Connect #}
 
       <div class="form-box">
@@ -288,6 +292,8 @@
         </fieldset>
       </form>
     </div> {# /Google Connect #}
+    {% endif %}
+
   </div>
 
   </div> {# end of .tab-contents #}