diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/VERSION | 2 | ||||
| -rw-r--r-- | templates/org/settings.tmpl (renamed from templates/org/setting.tmpl) | 56 |
2 files changed, 20 insertions, 38 deletions
diff --git a/templates/VERSION b/templates/VERSION index b5cda695b5..be0ebee0f5 100644 --- a/templates/VERSION +++ b/templates/VERSION @@ -1 +1 @@ -0.4.5.0625 Alpha
\ No newline at end of file +0.4.5.0627 Alpha
\ No newline at end of file diff --git a/templates/org/setting.tmpl b/templates/org/settings.tmpl index 1be9707a1a..e19c027d44 100644 --- a/templates/org/setting.tmpl +++ b/templates/org/settings.tmpl @@ -4,32 +4,20 @@ <div class="container"> <div class="btn-group pull-left" id="dashboard-switch"> <button type="button" class="btn btn-default"> - <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" - title="username"> - gogits + <img src="{{.Org.AvatarLink}}?s=28" alt="user-avatar" title="username"> + {{.Org.Name}} </button> - <!-- - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> - <span class="caret"></span> - </button> - <div class="dropdown-menu clone-group-btn no-propagation"> - <ul id="dashboard-switch-menu" class="list-unstyled"> - <li class="checked"><a href="#"><i class="fa fa-check"></i> - <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username"> - gogits/gogs</a> - </li> - </ul> - </div>--> </div> <ul class="nav nav-pills pull-right"> - <li><a href="/">Feed</a></li> - <li><a href="/issues">Issues</a></li> - <li class="active"><a href="#">Setting</a></li> + <li><a href="/org/{{.Org.Name}}/dashboard/">News Feed</a></li> + <li><a href="/org/{{.Org.Name}}/dashboard/issues">Issues</a></li> + <li class="active"><a href="/org/{{.Org.Name}}/settings">Settings</a></li> <!-- <li><a href="/pulls">Pull Requests</a></li> <li><a href="/stars">Stars</a></li> --> </ul> </div> </div> + <div id="body" class="container" data-page="org"> <div id="user-setting-nav" class="col-md-2 repo-setting-nav"> <ul class="list-group"> @@ -40,52 +28,46 @@ {{template "base/alert" .}} <div class="panel panel-default"> <div class="panel-heading"> - Repository Options + Organization Options </div> <div class="panel-body"> - <form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="form-horizontal"> + <form action="/org/{{.Org.Name}}/settings" method="post" class="form-horizontal"> {{.CsrfTokenHtml}} <input type="hidden" name="action" value="update"> - <div class="form-group"> - <label class="col-md-3 text-right" for="org-setting-name">Name</label> - + <div class="form-group{{if .Err_DisplayName}} has-error has-feedback{{end}}"> + <label class="col-md-3 text-right" for="org-setting-name">Display Name</label> <div class="col-md-9"> - <input class="form-control" name="name" value="" title="" id="org-setting-name"/> + <input class="form-control" name="display_name" value="{{.Org.FullName}}" title="" id="org-setting-name"/> </div> </div> - <div class="form-group"> + <div class="form-group{{if .Err_Email}} has-error has-feedback{{end}}"> <label class="col-md-3 text-right" for="org-email">Email</label> - <div class="col-md-9"> - <input class="form-control" name="email" value="" title="" id="org-email" type="email"/> + <input class="form-control" name="email" value="{{.Org.Email}}" title="" id="org-email" type="email"/> </div> </div> - <div class="form-group"> + <div class="form-group{{if .Err_Description}} has-error has-feedback{{end}}"> <label class="col-md-3 text-right" for="org-desc">Description</label> - <div class="col-md-9"> - <textarea class="form-control" name="desc" id="org-desc" rows="3">{{.Repository.Description}}</textarea> + <textarea class="form-control" name="desc" id="org-desc" rows="3">{{.Org.Description}}</textarea> </div> </div> - <div class="form-group"> + <div class="form-group{{if .Err_Website}} has-error has-feedback{{end}}"> <label class="col-md-3 text-right" for="org-site">Official Site</label> - <div class="col-md-9"> - <input type="url" class="form-control" name="site" value="{{.Repository.Website}}" - id="org-site"/> + <input type="url" class="form-control" name="site" value="{{.Org.Website}}" id="org-site"/> </div> </div> - <div class="form-group"> + <div class="form-group{{if .Err_Location}} has-error has-feedback{{end}}"> <label class="col-md-3 text-right" for="org-location">Location</label> - <div class="col-md-9"> - <input class="form-control" name="email" value="" title="" id="org-location"/> + <input class="form-control" name="location" value="{{.Org.Location}}" title="" id="org-location"/> </div> </div> |