wonderful
/
gitea-1120-rc1
forked from Gitlink/gitea-1120-rc1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #332 from acusti/dev 

Styling plus a couple small fixes for issue attachments (& misc cleanup)
This commit is contained in:
无闻 2014-07-26 13:55:32 -04:00
parent 27a51f5bcc 6407caa761
commit 02a81ddb62
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/css/gogs.css
View File

@ -1826,21 +1826,24 @@ body {
}
#attached {
height: 18px;
margin: 10px 10px 15px 10px;
margin: 10px 0 15px;
}
#attached-list .label {
display: inline-block;
vertical-align: top;
margin-right: 10px;
padding-right: 0;
}
#attached-list .label .attachment-remove {
cursor: pointer;
}
#attached-list .label .attachment-remove:hover {
background: #d8d8d8;
}
#issue-create-form #attached {
margin-bottom: 0;
}
#submit-error {
display: none;
padding: 10px 15px 15px 15px;
font-weight: bold;
text-align: center;
}

38
public/js/app.js
View File

@ -470,8 +470,8 @@ function initRepository() {
function initInstall() {
// database type change
(function () {
var mysql_default = '127.0.0.1:3306'
var postgres_default = '127.0.0.1:5432'
var mysql_default = '127.0.0.1:3306';
var postgres_default = '127.0.0.1:5432';
$('#install-database').on("change", function () {
var val = $(this).val();
@ -621,11 +621,9 @@ function initIssue() {
// Upload.
(function() {
var $attachedList = $("#attached-list");
var $addButton = $("#attachments-button");
var files = [];
var fileInput = document.getElementById("attachments-input");
var $addButton = $("#attachments-button");
var files = [];
var fileInput = document.getElementById("attachments-input");
if (fileInput === null) {
return;
@ -637,21 +635,21 @@ function initIssue() {
files.splice($parent.data("index"), 1);
$parent.remove();
});
var clickedButton = undefined;
$("button,input[type=\"submit\"]", fileInput.form).on("click", function() {
var clickedButton;
$('#issue-reply-btn,input[type="submit"]', fileInput.form).on('click', function() {
clickedButton = this;
var $button = $(this);
$button.removeClass("btn-success");
$button.removeClass("btn-success btn-default");
$button.addClass("btn-warning");
$button.text("Submiting...");
$button.text("Submitting…");
});
fileInput.form.addEventListener("submit", function(event) {
fileInput.form.addEventListener("submit", function(event) {
event.stopImmediatePropagation();
event.preventDefault();
@ -677,7 +675,7 @@ function initIssue() {
var xhr = new XMLHttpRequest();
xhr.addEventListener("error", function() {
debugger;
console.log("Issue submit request failed. xhr.status: " + xhr.status);
});
xhr.addEventListener("load", function() {
@ -700,7 +698,7 @@ function initIssue() {
$button.removeClass("btn-warning");
$button.addClass("btn-danger");
$button.text("An error encoured!")
$button.text("An error occurred!");
return;
}
@ -728,7 +726,7 @@ function initIssue() {
return false;
});
fileInput.addEventListener("change", function(event) {
fileInput.addEventListener("change", function() {
for (var index = 0; index < fileInput.files.length; index++) {
var file = fileInput.files[index];
@ -754,9 +752,9 @@ function initIssue() {
this.value = "";
});
$addButton.on("click", function() {
$addButton.on("click", function(evt) {
fileInput.click();
return false;
evt.preventDefault();
});
}());
@ -769,7 +767,7 @@ function initIssue() {
$('.issue-edit-cancel').on("click", function () {
$('#issue h1.title,#issue .issue-main > .issue-content .content,#issue-edit-btn').toggleShow();
$('#issue-edit-title,.issue-edit-content,.issue-edit-cancel,.issue-edit-save').toggleHide();
})
});
}());
// issue ajax update