diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin/org/list.tmpl | 3 | ||||
| -rw-r--r-- | templates/base/footer.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/org/team/new.tmpl | 15 | ||||
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 2 |
6 files changed, 22 insertions, 4 deletions
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index f2e258355d..362352b695 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -5,6 +5,9 @@ {{template "base/alert" .}} <h4 class="ui top attached header"> {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) + <div class="ui right"> + <a class="ui black tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a> + </div> </h4> <div class="ui attached segment"> {{template "admin/base/search" .}} diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index e8ad0a4d9f..643a2f1c85 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -51,7 +51,7 @@ <!-- Third-party libraries --> {{if .RequireHighlightJS}} - <script src="{{AppSubUrl}}/plugins/highlight-9.6.0/highlight.pack.js"></script> + <script src="{{AppSubUrl}}/plugins/highlight-9.11.0/highlight.pack.js"></script> {{end}} {{if .RequireMinicolors}} <script src="{{AppSubUrl}}/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js"></script> diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 61f0def7d9..f357b95166 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -40,7 +40,7 @@ <link rel="stylesheet" href="{{AppSubUrl}}/css/index.css?v={{MD5 AppVer}}"> {{if .RequireHighlightJS}} - <link rel="stylesheet" href="{{AppSubUrl}}/plugins/highlight-9.6.0/github.css"> + <link rel="stylesheet" href="{{AppSubUrl}}/plugins/highlight-9.11.0/github.css"> {{end}} {{if .RequireMinicolors}} <link rel="stylesheet" href="{{AppSubUrl}}/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css"> diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 020eed384d..2f7c5b268f 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -52,6 +52,21 @@ <div class="ui divider"></div> {{end}} + <div class="required grouped field"> + <label>{{.i18n.Tr "org.team_unit_desc"}}</label> + <br> + {{range $t, $unit := $.Units}} + <div class="field"> + <div class="ui toggle checkbox"> + <input type="checkbox" class="hidden" name="units" value="{{$unit.Type}}"{{if $.Team.EnableUnit $unit.Type}} checked{{end}}> + <label>{{$.i18n.Tr $unit.NameKey}}</label> + <span class="help">{{$.i18n.Tr $unit.DescKey}}</span> + </div> + </div> + {{end}} + </div> + <div class="ui divider"></div> + <div class="field"> {{if .PageIsOrgTeamsNew}} <button class="ui green button">{{.i18n.Tr "org.create_new_team"}}</button> diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index cd158663f0..7a444c17d2 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -8,7 +8,7 @@ {{template "user/dashboard/feeds" .}} </div> <div id="dashboard-repo-search" class="six wide column"> - <div class="ui {{if not .ContextUser.IsOrganization}}three{{else}}two{{end}} item tabable menu"> + <div class="ui {{if not .ContextUser.IsOrganization}}three{{else}}two{{end}} item stackable tabable menu"> <a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{.i18n.Tr "repository"}}</a> {{if not .ContextUser.IsOrganization}} <a :class="{item: true, active: tab === 'orgs'}" @click="changeTab('orgs')">{{.i18n.Tr "organization"}}</a> diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index fcc9b9cac5..12768bca52 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -1,7 +1,7 @@ {{range .Feeds}} <div class="news"> <div class="ui left"> - <img class="ui avatar image" src="{{.ActAvatar}}" alt=""> + <img class="ui avatar image" src="{{.GetActAvatar}}" alt=""> </div> <div class="ui grid"> <div class="ui fifteen wide column"> |