WIP: reconstruct layouts

* login/error.html

lib/views/login/error.html

@@ -1,56 +1,53 @@
-{% extends '../layout-growi/base/layout.html' %}
+{% extends '../layout/layout.html' %}
 
-{% block html_title %}Error · {% endblock %}
+{% block html_base_css %}error nologin{% endblock %}
 
-{% block content_main %}
+{% block html_title %}セットアップ {% endblock %}
 
-<h1 class="login-page">
-  {% if config.crowi['app:title'] == 'Crowi' %}
-    <img src="/images/logo/135x32.png" alt="Crowi">
-  {% else %}
-    {{ config.crowi['app:title'] }}<br>
-    <img src="/images/logo/100x11_w.png" alt="powered by Crowi">
-  {% endif %}
-</h1>
 
-<div class="login-dialog-container col-md-5">
 
-<div class="login-dialog" id="login-dialog">
+{#
+ # Remove default contents
+ #}
+{% block html_head_loading_legacy %}
+{% endblock %}
+{% block html_head_loading_app %}
+{% endblock %}
+{% block layout_head_nav %}
+{% endblock %}
+{% block sidebar %}
+{% endblock %}
 
-  <div class="login-dialog-inner front">
-    {% if reason === 'registered'%}
 
-      <h2>登録完了</h2>
 
-      <p class="text-center">
-        <i class="fa fa-smile-o fa-3x"></i>
-      </p>
-      <hr>
-      <div class="alert alert-info text-center">
-        {{ reasonMessage }}
-      </div>
+{% block layout_main %}
+
+<div class="main container-fluid">
 
-    {% else %}
+  <div class="row">
 
-      <h2>ログインエラー</h2>
+    <div class="login-header col-sm-offset-4 col-sm-4">
+      <div class="logo">{% include '../widget/logo.html' %}</div>
+      <h1>GROWI</h1>
 
-      <p class="text-center">
-        <i class="fa fa-meh-o fa-3x"></i>
-      </p>
-      <hr>
-      {% if reasonMessage != '' %}
-      <div class="alert alert-danger text-center">
-        {{ reasonMessage }}
+      <div class="m-b-15 login-form-errors text-center">
+        {% if reason === 'registered'%}
+        <div class="alert alert-success">
+          <h2>登録完了</h2>
+        </div>
+        {% else %}
+        <div class="alert alert-warning">
+            <h2>ログインエラー</h2>
+        </div>
+        {% endif %}
       </div>
-      {% endif %}
 
-    {% endif %}
+      <p>{{ reasonMessage }}</p>
+    </div>
 
-  </div>
 
-</div>
+  </div>{# /.row #}
 
-</div>
+</div>{# /.main #}
 
 {% endblock %}
-

resource/styles/scss/_login.scss

@@ -1,4 +1,4 @@
-.login-page, .installer, .invited {
+.nologin {
   $gray-dark-for-login: darken(white, 30%);
 
   // background color
@@ -220,7 +220,7 @@
 }
 
 
-.installer, .invited {
+.installer, .invited, .nologin.error {
   // layout
   .main .row {
     @media(min-width: 510px) {
@@ -233,3 +233,9 @@
     }
   }
 }
+
+.nologin.error {
+  .alert h2 {
+    line-height: 1em;
+  }
+}