projectのトラッカーやリポジトリ、カテゴリなど未設定の部分のデフォルトテキストをつけた

kawazrepos · Oct 25, 2014 · 3b94b6a · 3b94b6a · tunacook · Oct 25, 2014
1 parent 7f5aa16
commit 3b94b6a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 5 deletions.
diff --git a/src/statics/less/main.less b/src/statics/less/main.less
@@ -268,6 +268,12 @@ span {
   background: #FCF8E3;
 }
 
+// 「未設定」
+.none_set {
+  color: @gray-light;
+  font-style: italic;
+}
+
 // 神降臨
 .god {
   position: fixed;

diff --git a/src/statics/less/projects.less b/src/statics/less/projects.less
@@ -213,3 +213,9 @@
     margin-top: 20px;
   }
 }
+
+
+
+.hoge {
+  color: red;
+}
diff --git a/src/templates/events/components/list-item.html b/src/templates/events/components/list-item.html
@@ -11,7 +11,11 @@
                 <h3>{% if event.period_start %}<span class="title-date">{{ event.period_start | date:"m/d" }} </span>{% endif %}{{ event.title }}</h3>
                 <div class="event-category">
                     <span class="glyphicon glyphicon-folder-open event-category-icon"></span>
-                    <span>{{ event.category | default_if_none:"未設定" }}</span>
+                {% if event.category %}
+                    <span>{{ event.category }}</span>
+                {% else %}
+                    <span class="none_set">{% trans "None" %}</span>
+                {% endif %}
                 </div>
             </div>
 

diff --git a/src/templates/events/event_detail.html b/src/templates/events/event_detail.html
@@ -21,7 +21,11 @@
 <div class="page-header event-detail-header-wrap">
     <div class="event-category">
         <span class="glyphicon glyphicon-folder-open event-category-icon"></span>
-        <span>{{ event.category | default_if_none:"未設定" }}</span>
+        {% if event.category %}
+            <span>{{ event.category }}</span>
+        {% else %}
+            <span class="none_set">{% trans "None" %}</span>
+        {% endif %}
     </div>
     <div class="event-title{% if object.pub_state == "protected" %} bg-protected{% endif %}">
         {% if event.pub_state == 'protected' %}

diff --git a/src/templates/projects/project_detail.html b/src/templates/projects/project_detail.html
@@ -37,15 +37,33 @@ <h1>{{ project.title }}</h1>
         </dl>
         <dl class="row">
           <dt class="col col-lg-3 col-xs-4">{% trans "Category" %}</dt>
-          <dd class="col col-lg-9 col-xs-8">{{ project.category }}</dd>
+          <dd class="col col-lg-9 col-xs-8">
+          {% if project.category %}
+            {{ project.category }}
+          {% else %}
+            <span class="none_set">{% trans "None" %}</span>
+          {% endif %}
+          </dd>
         </dl>
         <dl class="row">
           <dt class="col col-lg-3 col-xs-4">{% trans "Tracker" %}</dt>
-          <dd class="col col-lg-9 col-xs-8"><a href="{{ project.tracker }}">{{ project.tracker }}</a></dd>
+          <dd class="col col-lg-9 col-xs-8">
+          {% if project.tracker %}
+          <a href="{{ project.tracker }}">{{ project.tracker }}</a>
+          {% else %}
+            <span class="none_set">{% trans "None" %}</span>
+          {% endif %}
+          </dd>
         </dl>
         <dl class="row">
           <dt class="col col-lg-3 col-xs-4">{% trans "Repository" %}</dt>
-          <dd class="col col-lg-9 col-xs-8"><a href="{{ project.repository }}">{{ project.repository }}</a></dd>
+          <dd class="col col-lg-9 col-xs-8">
+          {% if project.repository %}
+            <a href="{{ project.repository }}">{{ project.repository }}</a>
+          {% else %}
+            <span class="none_set">{% trans "None" %}</span>
+          {% endif %}
+          </dd>
         </dl>
       </div>
     </div>