diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-05-14 10:55:41 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-05-14 10:55:41 -0400 |
| commit | e880a2fa48e1b5d9fc850a507cd7dcc605e47458 (patch) | |
| tree | b5c6d0b00e7f15a53a0ce2c799786206822453d6 /templates | |
| parent | 46fc36c3a63b5501ca154df885ae5446ebb66220 (diff) | |
| parent | a1bb3741d5806e11da528078cde90998c8aebb05 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/issue/create.tmpl | 42 | ||||
| -rw-r--r-- | templates/issue/view.tmpl | 2 |
2 files changed, 43 insertions, 1 deletions
diff --git a/templates/issue/create.tmpl b/templates/issue/create.tmpl index 6d08f699..4b43116c 100644 --- a/templates/issue/create.tmpl +++ b/templates/issue/create.tmpl @@ -31,6 +31,48 @@ </ul> </div> </div> + <span><strong id="milestone" data-no-milestone="No milestone">No milestone</strong></span> + <input type="hidden" name="milestoneid" value="0" id="milestone-id"/> + <div style="display: inline-block;position: relative"> + <button type="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown"> + <i class="fa fa-check-square-o"></i> + <span class="caret"></span> + </button> + <div class="dropdown-menu milestone"> + <ul class="list-unstyled"> + <li data-id="0" class="clear-milestone milestone-item hidden"><i class="fa fa-times-circle-o"></i> Clear milestone </li> + <li class="milestone-list"> + <ul class="nav nav-tabs" data-init="tabs"> + <li class="active"><a href="#milestone-open" data-toggle="tab">Open</a></li> + <li><a href="#milestone-close" data-toggle="tab">Closed</a></li> + </ul> + <div class="tab-content"> + <div class="tab-pane active" id="milestone-open"> + <p class="milestone-item">Nothing to show</p> + <ul class="list-unstyled"> + <li class="milestone-item" data-id="1"> + <p><strong>Milestone name</strong></p> + <p>due to 3 days later</p> + </li> + <li class="milestone-item" data-id="1"> + <p><strong>Milestone name</strong></p> + <p>due to 3 days later</p> + </li> + </ul> + </div> + <div class="tab-pane" id="milestone-close"> + <ul class="list-unstyled"> + <li class="milestone-item" data-id="1"> + <p><strong>Milestone name</strong></p> + <p>closed 3 days ago</p> + </li> + </ul> + </div> + </div> + </li> + </ul> + </div> + </div> </div> <div class="form-group panel-body"> <div class="md-help pull-right"><!-- todo help link --> diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl index 22c0e2d8..5aeb9409 100644 --- a/templates/issue/view.tmpl +++ b/templates/issue/view.tmpl @@ -108,7 +108,7 @@ </button> <div class="dropdown-menu dropdown-menu-right"> <ul class="list-unstyled"> - <li data-id="0" class="clear-milestone hidden"><i class="fa fa-times-circle-o"></i> Clear milestone </li> + <li data-id="0" class="clear-milestone milestone-item hidden"><i class="fa fa-times-circle-o"></i> Clear milestone </li> <li class="milestone-list"> <ul class="nav nav-tabs" data-init="tabs"> <li class="active"><a href="#milestone-open" data-toggle="tab">Open</a></li> |