標準テンプレートをsimpleからBootstrapに

uzulla · Jan 13, 2014 · 1c1c242 · 1c1c242
1 parent f72b79f
commit 1c1c242
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 97 deletions.
diff --git a/templates_bootstrap/Post/confirm.twig → templates/Post/confirm.twig b/templates_bootstrap/Post/confirm.twig → templates/Post/confirm.twig
diff --git a/templates/Post/form.twig b/templates/Post/form.twig
@@ -1,6 +1,6 @@
 {% extends "frame.twig" %}
 {% block content %}
-{% autoescape true %}
-{% include "_Parts/Form.twig" %}
-{% endautoescape %}
+    {% autoescape true %}
+    {% include "_Parts/Form.twig" %}
+    {% endautoescape %}
 {% endblock %}
diff --git a/templates/TimeLine/show.twig b/templates/TimeLine/show.twig
@@ -11,11 +11,11 @@
 {% for post in post_list %}
     <div class="postcell">
         <div class="body">{{ post.body|nl2br }}</div>
-        <div>
-            post by <span class="nickname">{{ post.nickname }}</span> ({{ post.created_at }})
+        <div class="info">
+            post by <span class="nickname">{{ post.nickname }}</span>
+            <span class="date">({{ post.created_at }})</span>
         </div>
     </div>
-    <hr>
 {% endfor %}
 
 {% include "_Parts/Pager.twig" %}

diff --git a/templates/_Parts/Pager.twig b/templates/_Parts/Pager.twig
@@ -1,19 +1,19 @@
 {% autoescape true %}
-<br>
+<div class="text-center">
+    <ul class="pagination pagination-lg">
+        {% if page_num > 1 %}
+            {% if (page_num-1) == 1 %}
+                <li class="active"><a href="/" class="prev">&laquo;</a></li>
+            {% else %}
+                <li class="active"><a href="/page/{{page_num-1}}" class="prev">&laquo;</a></li>
+            {% endif %}
+        {% endif %}
 
-{% if page_num > 1 %}
-    {% if (page_num-1) == 1 %}
-        <a href="/" class="prev">＜前</a>
-    {% else %}
-        <a href="/page/{{page_num-1}}" class="prev">＜前</a>
-    {% endif %}
-{% endif %}
+        <li><span class="page-num">{{page_num}}</span></li>
 
-[<span class="page-num">{{page_num}}</span>p]
-
-{% if next_page_is_exist %}
-    <a href="/page/{{page_num+1}}" class="next">次＞</a>
-{% endif %}
-
-<br>
+        {% if next_page_is_exist %}
+            <li class="active"><a href="/page/{{page_num+1}}" class="next">&raquo;</a></li>
+        {% endif %}
+    </ul>
+</div>
 {% endautoescape %}
diff --git a/templates_bootstrap/_Parts/form.twig → templates/_Parts/form.twig b/templates_bootstrap/_Parts/form.twig → templates/_Parts/form.twig
diff --git a/templates/frame.twig b/templates/frame.twig
@@ -1,11 +1,46 @@
 {% autoescape true %}
-<html>
+<!DOCTYPE html>
+<html lang="ja">
 <head>
     <meta charset="UTF-8">
     <title>Tinitter</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap-theme.min.css">
+
+    <link rel="stylesheet" href="/css/site.css">
 </head>
 <body>
-    {% block content %}{% endblock %}
+
+<header class="navbar navbar-inverse bs-docs-nav" role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <a href="/" class="navbar-brand">Tinitter</a>
+        </div>
+    </div>
+</header>
+
+<main id="content" role="main">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-3"></div>
+            <div class="col-md-6">
+                {% block content %}{% endblock %}
+            </div>
+            <div class="col-md-3"></div>
+        </div>
+    </div>
+</main>
+
+<footer>
+    <div class="container">
+        <hr>
+        <p class="text-center">Powered by PHP</p>
+    </div>
+</footer>
+
+<script src="/vendor/jquery.js"></script>
+<script src="/vendor/bootstrap/js/bootstrap.min.js"></script>
 </body>
 </html>
 {% endautoescape %}
diff --git a/templates_bootstrap/Post/form.twig b/templates_bootstrap/Post/form.twig
diff --git a/templates_bootstrap/_Parts/Pager.twig b/templates_bootstrap/_Parts/Pager.twig
diff --git a/templates_bootstrap/frame.twig b/templates_bootstrap/frame.twig
diff --git a/templates_simple/Post/form.twig b/templates_simple/Post/form.twig
@@ -0,0 +1,6 @@
+{% extends "frame.twig" %}
+{% block content %}
+{% autoescape true %}
+{% include "_Parts/Form.twig" %}
+{% endautoescape %}
+{% endblock %}
diff --git a/templates_bootstrap/TimeLine/show.twig → templates_simple/TimeLine/show.twig b/templates_bootstrap/TimeLine/show.twig → templates_simple/TimeLine/show.twig
@@ -11,11 +11,11 @@
 {% for post in post_list %}
     <div class="postcell">
         <div class="body">{{ post.body|nl2br }}</div>
-        <div class="info">
-            post by <span class="nickname">{{ post.nickname }}</span>
-            <span class="date">({{ post.created_at }})</span>
+        <div>
+            post by <span class="nickname">{{ post.nickname }}</span> ({{ post.created_at }})
         </div>
     </div>
+    <hr>
 {% endfor %}
 
 {% include "_Parts/Pager.twig" %}

diff --git a/templates/_Parts/Form.php → templates_simple/_Parts/Form.php b/templates/_Parts/Form.php → templates_simple/_Parts/Form.php
diff --git a/templates_simple/_Parts/Pager.twig b/templates_simple/_Parts/Pager.twig
@@ -0,0 +1,19 @@
+{% autoescape true %}
+<br>
+
+{% if page_num > 1 %}
+    {% if (page_num-1) == 1 %}
+        <a href="/" class="prev">＜前</a>
+    {% else %}
+        <a href="/page/{{page_num-1}}" class="prev">＜前</a>
+    {% endif %}
+{% endif %}
+
+[<span class="page-num">{{page_num}}</span>p]
+
+{% if next_page_is_exist %}
+    <a href="/page/{{page_num+1}}" class="next">次＞</a>
+{% endif %}
+
+<br>
+{% endautoescape %}
diff --git a/templates_simple/frame.twig b/templates_simple/frame.twig
@@ -0,0 +1,11 @@
+{% autoescape true %}
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Tinitter</title>
+</head>
+<body>
+    {% block content %}{% endblock %}
+</body>
+</html>
+{% endautoescape %}