From 1d6507defba09a26ad806bf01fb425632f1ea258 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Tue, 2 Jul 2013 14:25:15 +0900
Subject: [PATCH] Move common view templates to 'helper' package.

---
 .../twirl/{ => helper}/datepicker.scala.html  |  0
 src/main/twirl/{ => helper}/diff.scala.html   |  0
 src/main/twirl/helper/dropdown.scala.html     | 10 +++++
 .../twirl/{ => helper}/paginator.scala.html   |  0
 .../twirl/{ => helper}/preview.scala.html     |  0
 src/main/twirl/issues/create.scala.html       | 42 +++++++------------
 src/main/twirl/issues/issue.scala.html        |  2 +-
 src/main/twirl/issues/list.scala.html         | 28 +++++--------
 .../twirl/issues/milestones/edit.scala.html   |  2 +-
 src/main/twirl/repo/commit.scala.html         |  2 +-
 src/main/twirl/wiki/compare.scala.html        |  2 +-
 src/main/twirl/wiki/edit.scala.html           |  2 +-
 12 files changed, 41 insertions(+), 49 deletions(-)
 rename src/main/twirl/{ => helper}/datepicker.scala.html (100%)
 rename src/main/twirl/{ => helper}/diff.scala.html (100%)
 create mode 100644 src/main/twirl/helper/dropdown.scala.html
 rename src/main/twirl/{ => helper}/paginator.scala.html (100%)
 rename src/main/twirl/{ => helper}/preview.scala.html (100%)

diff --git a/src/main/twirl/datepicker.scala.html b/src/main/twirl/helper/datepicker.scala.html
similarity index 100%
rename from src/main/twirl/datepicker.scala.html
rename to src/main/twirl/helper/datepicker.scala.html
diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/helper/diff.scala.html
similarity index 100%
rename from src/main/twirl/diff.scala.html
rename to src/main/twirl/helper/diff.scala.html
diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
new file mode 100644
index 000000000..d5e2c11c1
--- /dev/null
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -0,0 +1,10 @@
+@(body: Html)
+<div class="btn-group">
+  <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+    <i class="icon-cog"></i>
+    <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu">
+    @body
+  </ul>
+</div>
diff --git a/src/main/twirl/paginator.scala.html b/src/main/twirl/helper/paginator.scala.html
similarity index 100%
rename from src/main/twirl/paginator.scala.html
rename to src/main/twirl/helper/paginator.scala.html
diff --git a/src/main/twirl/preview.scala.html b/src/main/twirl/helper/preview.scala.html
similarity index 100%
rename from src/main/twirl/preview.scala.html
rename to src/main/twirl/helper/preview.scala.html
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 123cde04f..9e4043070 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -14,39 +14,27 @@
           <div>
             <span id="label-assigned">No one is assigned</span>
             <input type="hidden" name="assignedUserName" value=""/>
-            <div class="btn-group">
-              <button class="btn dropdown-toggle" data-toggle="dropdown">
-                <i class="icon-cog"></i>
-                <span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu">
-                <li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
-                <li class="divider"></li>
-                @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
-                }
-              </ul>
-            </div>
+            @helper.html.dropdown {
+              <li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
+              <li class="divider"></li>
+              @collaborators.map { collaborator =>
+                <li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
+              }
+            }
             <div class="pull-right">
               <span id="label-milestone">No milestone</span>
               <input type="hidden" name="milestoneId" value=""/>
-              <div class="btn-group">
-                <button class="btn dropdown-toggle" data-toggle="dropdown">
-                  <i class="icon-cog"></i>
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="javascript:void(0);" class="milestone" data-id="">No milestone</a></li>
-                  <li class="divider"></li>
-                  @milestones.map { milestone =>
-                    <li><a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
-                  }
-                </ul>
-              </div>
+              @helper.html.dropdown {
+                <li><a href="javascript:void(0);" class="milestone" data-id="">No milestone</a></li>
+                <li class="divider"></li>
+                @milestones.map { milestone =>
+                  <li><a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
+                }
+              }
             </div>
           </div>
           <hr>
-          @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
+          @helper.html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
         </div>
       </div>
       <input type="submit" class="btn btn-success" value="Submit new issue"/>
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 749a703b1..5eb863453 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -48,7 +48,7 @@
       <form action="@url(repository)/issue_comments/new" method="POST" validate="true">
       <div class="box">
         <div class="box-content">
-          @html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
+          @helper.html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
         </div>
       </div>
       <input type="hidden" name="issueId" value="@issue.issueId"/>
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index 0834e7e79..51fba6f9b 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -41,21 +41,15 @@
           <span class="muted small">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title)
         }
       }
-      <div class="btn-group">
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          <i class="icon-cog"></i>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          @if(condition.milestoneId.isDefined){
-            <li><a href="@condition.copy(milestoneId = None).toURL">Clear milestone filter</a></li>
-          }
-          <li><a href="@condition.copy(milestoneId = Some(None)).toURL">Issues with no milestone</a></li>
-          @milestones.map { milestone =>
-            <li><a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">@milestone.title</a></li>
-          }
-        </ul>
-      </div>
+      @helper.html.dropdown {
+        @if(condition.milestoneId.isDefined){
+          <li><a href="@condition.copy(milestoneId = None).toURL">Clear milestone filter</a></li>
+        }
+        <li><a href="@condition.copy(milestoneId = Some(None)).toURL">Issues with no milestone</a></li>
+        @milestones.map { milestone =>
+          <li><a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">@milestone.title</a></li>
+        }
+      }
       @if(condition.milestoneId.isDefined && condition.milestoneId.get.isDefined){
         <div class="milestone-progress" style="margin-top: 8px;">
           @if(closedCount > 0){
@@ -97,7 +91,7 @@
         </a>
       }
       <div class="pull-right">
-        @html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
       </div>
       <div class="btn-group">
         <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
@@ -160,7 +154,7 @@
       }
       </table>
       <div class="pull-right">
-        @html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL)
       </div>
     </div>
   </div>
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index 1e2513f64..02461c3d7 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -17,7 +17,7 @@
     </fieldset>
     <fieldset>
       <label for="dueDate"><strong>Due Date</strong></label>
-      @html.datepicker("dueDate", milestone.flatMap(_.dueDate))
+      @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
       <span id="error-dueDate" class="error"></span>
     </fieldset>
     <hr>
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index f646de314..479baa462 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -93,7 +93,7 @@
     </li>
   }
   </ul>
-  @html.diff(diffs, repository, Some(commit.id))
+  @helper.html.diff(diffs, repository, Some(commit.id))
 }
 <script>
 $(function(){
diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html
index 7496e0fc9..41f6d36da 100644
--- a/src/main/twirl/wiki/compare.scala.html
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -20,5 +20,5 @@
       </div>
     </li>
   </ul>
-  @html.diff(diffs, repository, None)
+  @helper.html.diff(diffs, repository, None)
 }
diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
index 3d302becc..963978d61 100644
--- a/src/main/twirl/wiki/edit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -21,7 +21,7 @@
   <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
+    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
     <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
     <input type="hidden" name="currentPageName" value="@pageName"/>
     <input type="submit" value="Save" class="btn btn-success">