coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport: Fix layout of the topics editing form (#4971) (#4993)

This commit is contained in:
Iwasa Kazmi 2018-09-29 19:06:11 +09:00 committed by Lauris BH
parent 93dcc6caef
commit 8f29f61a6b
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/index.css
View File

File diff suppressed because one or more lines are too long

4
public/js/index.js
View File

@ -2309,7 +2309,7 @@ function initTopicbar() {
mgrBtn.click(function() { mgrBtn.click(function() {
viewDiv.hide(); viewDiv.hide();
editDiv.show(); editDiv.css('display', ''); // show Semantic UI Grid
}) })
saveBtn.click(function() { saveBtn.click(function() {
@ -2334,7 +2334,7 @@ function initTopicbar() {
} }
} }
}).done(function() { }).done(function() {
editDiv.hide(); editDiv.css('display', 'none'); // hide Semantic UI Grid
viewDiv.show(); viewDiv.show();
}).fail(function(xhr) { }).fail(function(xhr) {
alert(xhr.responseJSON.message) alert(xhr.responseJSON.message)

1
public/less/_repository.less
View File

@ -1743,7 +1743,6 @@ tbody.commit-list {
#topic_edit { #topic_edit {
margin-top:5px; margin-top:5px;
display: none;
} }
#repo-topic { #repo-topic {

4
templates/repo/home.tmpl
View File

@ -28,7 +28,7 @@
{{if .IsRepositoryAdmin}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}} {{if .IsRepositoryAdmin}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
</div> </div>
{{if .IsRepositoryAdmin}} {{if .IsRepositoryAdmin}}
<div class="ui repo-topic-edit grid" id="topic_edit" > <div class="ui repo-topic-edit grid" id="topic_edit" style="display:none">
<div class="fourteen wide column"> <div class="fourteen wide column">
<div class="ui fluid multiple search selection dropdown"> <div class="ui fluid multiple search selection dropdown">
<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if lt (Add $i 1) (len $.Topics)}},{{end}}{{end}}"> <input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if lt (Add $i 1) (len $.Topics)}},{{end}}{{end}}">
@ -38,7 +38,7 @@
<div class="text"></div> <div class="text"></div>
</div> </div>
</div> </div>
<div class="one wide column"> <div class="two wide column">
<a class="ui compact button primary" href="javascript:;" id="save_topic" <a class="ui compact button primary" href="javascript:;" id="save_topic"
data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a> data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a>
</div> </div>