summaryrefslogtreecommitdiffstats
path: root/templates/content
diff options
context:
space:
mode:
Diffstat (limited to 'templates/content')
-rw-r--r--templates/content/js/com.cnprog.admin.js4
-rw-r--r--templates/content/js/com.cnprog.i18n.js4
-rw-r--r--templates/content/js/com.cnprog.post.js78
-rw-r--r--templates/content/js/com.cnprog.utils.js8
-rw-r--r--templates/content/js/wmd/wmd.js4
-rw-r--r--templates/content/style/style.css36
6 files changed, 134 insertions, 0 deletions
diff --git a/templates/content/js/com.cnprog.admin.js b/templates/content/js/com.cnprog.admin.js
index cb1c1b15..7e91af79 100644
--- a/templates/content/js/com.cnprog.admin.js
+++ b/templates/content/js/com.cnprog.admin.js
@@ -3,7 +3,11 @@ $().ready( function(){
success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
dataType:'json',
timeout:5000,
+<<<<<<< HEAD:templates/content/js/com.cnprog.admin.js
+ url: $.i18n._('/') + $.i18n._('moderate-user/') + viewUserID + '/'
+=======
url: scriptUrl + $.i18n._('moderate-user/') + viewUserID + '/'
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.admin.js
};
var form = $('.admin #moderate_user_form').ajaxForm(options);
var box = $('.admin input#id_is_approved').click(function(){
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 7562628b..018927aa 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,6 +57,10 @@ var i18nZh = {
};
var i18nEn = {
+<<<<<<< HEAD:templates/content/js/com.cnprog.i18n.js
+ '/':'/',
+=======
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.i18n.js
'need >15 points to report spam':'need >15 points to report spam ',
'>15 points requried to upvote':'>15 points required to upvote ',
'tags cannot be empty':'please enter at least one tag',
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 33df1e21..a884b571 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -53,11 +53,19 @@ var Vote = function(){
var acceptAnonymousMessage = $.i18n._('insufficient privilege');
var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ var pleaseLogin = "<a href='" + $.i18n._("/") + $.i18n._("account/") + $.i18n._("signin/")
+ + "?next=" + $.i18n._("/") + $.i18n._("questions/") + "{{QuestionID}}'>"
+ + $.i18n._('please login') + "</a>";
+
+ var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + $.i18n._("/") + $.i18n._("faq/") + "'>faq</a>";
+=======
var pleaseLogin = "<a href='" + scriptUrl + $.i18n._("account/") + $.i18n._("signin/")
+ "?next=" + scriptUrl + $.i18n._("questions/") + "{{QuestionID}}'>"
+ $.i18n._('please login') + "</a>";
var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + scriptUrl + $.i18n._("faq/") + "'>faq</a>";
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions')
var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin;
@@ -151,17 +159,30 @@ var Vote = function(){
var setVoteImage = function(voteType, undo, object){
var flag = undo ? "" : "-on";
var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ object.attr("src", $.i18n._("/") + "content/images/vote-arrow-"+ arrow + flag +".png");
+=======
object.attr("src", scriptUrl + "content/images/vote-arrow-"+ arrow + flag +".png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
// if undo voting, then undo the pair of arrows.
if(undo){
if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ $(getQuestionVoteUpButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+ $(getQuestionVoteDownButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
+ }
+ else{
+ $(getAnswerVoteUpButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+ $(getAnswerVoteDownButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
+=======
$(getQuestionVoteUpButton()).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
$(getQuestionVoteDownButton()).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
}
else{
$(getAnswerVoteUpButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
$(getAnswerVoteDownButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
}
}
};
@@ -237,7 +258,11 @@ var Vote = function(){
type: "POST",
cache: false,
dataType: "json",
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ url: $.i18n._("/") + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+=======
url: scriptUrl + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
data: { "type": voteType, "postId": postId },
error: handleFail,
success: function(data){callback(object, voteType, data)}});
@@ -256,19 +281,31 @@ var Vote = function(){
showMessage(object, acceptOwnAnswerMessage);
}
else if(data.status == "1"){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
+=======
object.attr("src", scriptUrl + "content/images/vote-accepted.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
$("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
$("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
}
else if(data.success == "1"){
var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ $(acceptedButtons).attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
+=======
$(acceptedButtons).attr("src", scriptUrl + "content/images/vote-accepted.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
var answers = ("div[id^="+answerContainerIdPrefix +"]");
$(answers).removeClass("accepted-answer");
var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
$(commentLinks).removeClass("comment-link-accepted");
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ object.attr("src", $.i18n._("/") + "content/images/vote-accepted-on.png");
+=======
object.attr("src", scriptUrl + "content/images/vote-accepted-on.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
$("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
$("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
}
@@ -282,7 +319,11 @@ var Vote = function(){
showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
}
else if(data.status == "1"){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ object.attr("src", $.i18n._("/") + "content/images/vote-favorite-off.png");
+=======
object.attr("src", scriptUrl + "content/images/vote-favorite-off.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
var fav = getFavoriteNumber();
fav.removeClass("my-favorite-number");
if(data.count == 0)
@@ -290,7 +331,11 @@ var Vote = function(){
fav.text(data.count);
}
else if(data.success == "1"){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ object.attr("src", $.i18n._("/") + "/content/images/vote-favorite-on.png");
+=======
object.attr("src", scriptUrl + "content/images/vote-favorite-on.png");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
var fav = getFavoriteNumber();
fav.text(data.count);
fav.addClass("my-favorite-number");
@@ -359,7 +404,11 @@ var Vote = function(){
}
else if (data.success == "1"){
if (voteType == VoteType.removeQuestion){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ window.location.href = $.i18n._("/") + $.i18n._("questions/");
+=======
window.location.href = scriptUrl + $.i18n._("questions/");
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
}
else {
if (removeActionType == 'delete'){
@@ -500,7 +549,11 @@ function createComments(type) {
jDiv.append('<p id="' + divId + '" class="comment">'
+ $.i18n._('to comment, need') + ' ' +
+ repNeededForComments + ' ' + $.i18n._('community karma points')
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ + '<a href="' + $.i18n._('/') + $.i18n._('faq/') + '" class="comment-user">'
+=======
+ '<a href="' + scriptUrl + $.i18n._('faq/') + '" class="comment-user">'
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
+ $.i18n._('please see') + 'faq</a></span></p>');
}
}
@@ -508,7 +561,11 @@ function createComments(type) {
var getComments = function(id, jDiv) {
//appendLoaderImg(id);
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ $.getJSON($.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/")
+=======
$.getJSON(scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/")
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
, function(json) { showComments(id, json); });
};
@@ -529,8 +586,13 @@ function createComments(type) {
var renderDeleteCommentIcon = function(post_id, delete_url){
if (canPostComments(post_id)){
var html = '';
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ var img = $.i18n._("/") + "content/images/close-small.png";
+ var imgHover = $.i18n._("/") + "content/images/close-small-hover.png";
+=======
var img = scriptUrl + "content/images/close-small.png";
var imgHover = scriptUrl + "content/images/close-small-hover.png";
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
html += '<img class="delete-icon" onclick="' + objectType + 'Comments.deleteComment($(this), ' + post_id + ', \'' + delete_url + '\')" src="' + img;
html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
html += '\')" title="' + $.i18n._('delete this comment') + '" />';
@@ -569,7 +631,11 @@ function createComments(type) {
//todo fix url translations!!!
$.ajax({
type: "POST",
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
+=======
url: scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/"),
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
dataType: "json",
data: { comment: textarea.val() },
success: function(json) {
@@ -601,7 +667,11 @@ function createComments(type) {
$(this).children().each(
function(i){
var comment_id = $(this).attr('id').replace('comment-','');
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ var delete_url = $.i18n._('/') + objectType + 's/' + post_id + '/'
+=======
var delete_url = scriptUrl + objectType + 's/' + post_id + '/'
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
+ $.i18n._('comments/') + comment_id + '/' + $.i18n._('delete/');
var html = $(this).html();
var CommentsClass;
@@ -615,12 +685,20 @@ function createComments(type) {
delete_icon.click(function(){CommentsClass.deleteComment($(this),comment_id,delete_url);});
delete_icon.unbind('mouseover').bind('mouseover',
function(){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ $(this).attr('src',$.i18n._('/') + 'content/images/close-small-hover.png');
+=======
$(this).attr('src',scriptUrl + 'content/images/close-small-hover.png');
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
}
);
delete_icon.unbind('mouseout').bind('mouseout',
function(){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
+ $(this).attr('src',$.i18n._('/') + 'content/images/close-small.png');
+=======
$(this).attr('src',scriptUrl + 'content/images/close-small.png');
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.post.js
}
);
}
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index b19b6773..5c0c4a27 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -23,7 +23,11 @@ var notify = function() {
},
close: function(doPostback) {
if (doPostback) {
+<<<<<<< HEAD:templates/content/js/com.cnprog.utils.js
+ $.post($.i18n._("/") + $.i18n._("messages/") +
+=======
$.post(scriptUrl + $.i18n._("messages/") +
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.utils.js
$.i18n._("markread/"), { formdata: "required" });
}
$(".notify").fadeOut("fast");
@@ -36,7 +40,11 @@ var notify = function() {
function appendLoader(containerSelector) {
$(containerSelector).append('<img class="ajax-loader" '
+<<<<<<< HEAD:templates/content/js/com.cnprog.utils.js
+ +'src="' + $.i18n._('/') + 'content/images/indicator.gif" title="'
+=======
+'src="' + scriptUrl + 'content/images/indicator.gif" title="'
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.utils.js
+$.i18n._('loading...')
+'" alt="'
+$.i18n._('loading...')
diff --git a/templates/content/js/wmd/wmd.js b/templates/content/js/wmd/wmd.js
index e396d3cb..2234250b 100644
--- a/templates/content/js/wmd/wmd.js
+++ b/templates/content/js/wmd/wmd.js
@@ -54,7 +54,11 @@ Attacklab.wmdBase = function(){
var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" +
"<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
"onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" +
+<<<<<<< HEAD:templates/content/js/wmd/wmd.js
+ "<img id=\"loading\" src=\"" + $.i18n._("/") + "content/images/indicator.gif\" style=\"display:none;\"/>";
+=======
"<img id=\"loading\" src=\"" + scriptUrl + "content/images/indicator.gif\" style=\"display:none;\"/>";
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/wmd/wmd.js
// The default text that appears in the dialog input box when entering
// links.
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 47b4dc00..0a928cd2 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -114,6 +114,10 @@ blockquote
margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
#logo {
padding: 5px 0px 0px 0px;
+<<<<<<< HEAD:templates/content/style/style.css
+ margin-bottom:-3px;
+=======
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
}
#navBar {float:clear;position:relative;display:block;width:960px;}
#navBar .nav {margin:20px 0px 0px 16px;
@@ -162,7 +166,11 @@ blockquote
border-right:1px solid #b4b48e;
border-bottom:1px solid #b4b48e;*/
background: white;/* #f9f7ed;*/
+<<<<<<< HEAD:templates/content/style/style.css
+ margin:10px 0 10px 0;
+=======
/*margin:10px 0 10px 0;*/
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
/*background:url(../images/quest-bg.gif) repeat-x top;*/
}
#listA .qstA thumb {float:left; }
@@ -204,6 +212,9 @@ blockquote
/*border-bottom:1px solid #888a85;*/
}
.evenMore {font-size:14px; font-weight:800;}
+<<<<<<< HEAD:templates/content/style/style.css
+.questions-count{font-size:32px;font-family:sans-serif;font-weight:600;padding:0 0 5px 7px;color:#a40000;}
+=======
.questions-count{
font-size:32px;
font-family:sans-serif;
@@ -212,6 +223,7 @@ blockquote
color:#a40000;
margin-top:3px;
}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
/*内容块*/
.boxA {background:#888a85; padding:6px; margin-bottom:8px;border 1px solid #babdb6;}
@@ -223,7 +235,11 @@ blockquote
.boxB .body {border:1px solid #aaaaaa; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
.boxB .more {padding:1px; text-align:right; font-weight:800;}
.boxC {
+<<<<<<< HEAD:templates/content/style/style.css
+ background:#babdb6;/*f9f7ed;*/
+=======
background: #cacdc6;/*f9f7ed;*/
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
padding:10px;
margin-bottom:8px;
border-top:1px solid #eeeeec;
@@ -231,12 +247,15 @@ blockquote
border-right:1px solid #a9aca5;
border-bottom:1px solid #babdb6;
}
+<<<<<<< HEAD:templates/content/style/style.css
+=======
.boxC p {
margin-bottom:8px;
}
.boxC p.nomargin {
margin:0px;
}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
.boxC p.info-box-follow-up-links {
text-align:right;
margin:0;
@@ -270,7 +289,11 @@ blockquote
border:1px solid #fff;
background-color:#fff;
color:#777;
+<<<<<<< HEAD:templates/content/style/style.css
+ padding:.3em;
+=======
padding:2px 4px 3px 4px;
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
font:bold 100% sans-serif;
}
@@ -321,14 +344,21 @@ blockquote
/*标签*/
.tag {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
.tags {font-family:sans-serif; line-height:200%; display:block; margin-top:5px;}
+<<<<<<< HEAD:templates/content/style/style.css
+.tags a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+=======
.tags a {white-space: nowrap; font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
.tags a:hover {background-color:#fFF;color:#333;}
.tagsbox {line-height:200%;}
.tagsbox a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
.tagsbox a:hover {background-color:#fFF;color:#333;}
.tag-number {font-weight:700;font-family:sans-serif;}
+<<<<<<< HEAD:templates/content/style/style.css
+=======
.marked-tags { margin-top: 0px;margin-bottom: 5px; }
.deletable-tag { margin-right: 3px; white-space:nowrap; }
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
/*奖牌*/
a.medal { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(../images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
@@ -1158,9 +1188,12 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
.message p {
margin-bottom:0px;
}
+<<<<<<< HEAD:templates/content/style/style.css
+=======
.message p.space-above {
margin-top:10px;
}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
.warning{color:red;}
.darkred{color:darkred;}
@@ -1437,6 +1470,8 @@ ul.form-horizontal-rows li input {
text-align:center;
font-weight:bold;
}
+<<<<<<< HEAD:templates/content/style/style.css
+=======
#tagSelector {
padding-bottom: 2px;
}
@@ -1446,3 +1481,4 @@ ul.form-horizontal-rows li input {
#hideIgnoredTagsCb {
margin: 0 2px 0 1px;
}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/style/style.css
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 11:27:51 +0000