diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-05-15 11:37:21 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-05-15 11:37:21 -0600 |
commit | 8e3cc56cd9297535085425da2103721c687fd366 (patch) | |
tree | c203a7f8eff48165787a22b5fcf78c1463c5cbe4 | |
parent | 994c92a2e4351603dbeda71452a1493186878d21 (diff) | |
parent | 68883de9a3f294d3dfa7e59e6a8765c341d710a5 (diff) | |
download | askbot-8e3cc56cd9297535085425da2103721c687fd366.tar.gz askbot-8e3cc56cd9297535085425da2103721c687fd366.tar.bz2 askbot-8e3cc56cd9297535085425da2103721c687fd366.zip |
Merge branch 'master' of github.com:ASKBOT/askbot-devel into solr
-rw-r--r-- | askbot/media/js/live_search.js | 4 | ||||
-rw-r--r-- | askbot/media/js/utils.js | 2 | ||||
-rw-r--r-- | askbot/media/style/style.css | 27 | ||||
-rw-r--r-- | askbot/media/style/style.less | 30 | ||||
-rw-r--r-- | askbot/templates/base.html | 1 | ||||
-rw-r--r-- | askbot/templates/question.html | 7 | ||||
-rw-r--r-- | askbot/templates/user_profile/user_network.html | 2 | ||||
-rw-r--r-- | askbot/tests/page_load_tests.py | 11 |
8 files changed, 43 insertions, 41 deletions
diff --git a/askbot/media/js/live_search.js b/askbot/media/js/live_search.js index 1aebb6ce..b812070c 100644 --- a/askbot/media/js/live_search.js +++ b/askbot/media/js/live_search.js @@ -409,7 +409,7 @@ FullTextSearch.prototype.runTagSearch = function() { url: url, dataType: 'json', success: function(data, text_status, xhr){ - me.renderFullTextResult(data, text_status, xhr); + me.renderFullTextSearchResult(data, text_status, xhr); $('#ab-tag-search').val(''); }, }); @@ -445,7 +445,7 @@ FullTextSearch.prototype.activateTagSearchInput = function() { matchInside: true, maxCacheLength: 100, maxItemsToShow: 20, - onItemSelect: function(){ this.runTagSearch(); }, + onItemSelect: function(){ me.runTagSearch(); }, delay: 10 }); ac.decorate($('#ab-tag-search')); diff --git a/askbot/media/js/utils.js b/askbot/media/js/utils.js index 9d1e1c51..0380e6fe 100644 --- a/askbot/media/js/utils.js +++ b/askbot/media/js/utils.js @@ -1286,7 +1286,7 @@ FileUploadDialog.prototype.createDom = function() { upload_input.attr({ id: this._input_id, type: 'file', - name: 'file-upload', + name: 'file-upload' //size: 26??? }); form.append(upload_input); diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index 87aa39b4..695b33b4 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -63,6 +63,13 @@ textarea:focus, input:focus { outline: none; } +input[type="text"], +input[type="password"], +select, +textarea, +#askFormBar .questionTitleInput { + border: #cce6ec 3px solid; +} iframe { border: none; } @@ -438,7 +445,6 @@ body.user-messages { } .validate-email-page #validation-code { padding-left: 5px; - border: #cce6ec 3px solid; height: 25px; font-size: 14px; width: 200px; @@ -475,7 +481,7 @@ body.user-messages { height: 26px; line-height: 26px; font-weight: 300; - background: #FFF; + background: transparent; border: 0px; color: #484848; font-family: Arial; @@ -502,7 +508,7 @@ body.user-messages { box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - width: 100% a; + width: 100%; } #searchBar input[type="submit"].searchBtn { right: 0; @@ -1168,7 +1174,6 @@ ul#searchTags { #question-list { float: left; position: relative; - background-color: #FFF; padding: 0; width: 100%; } @@ -1623,7 +1628,6 @@ ul#related-tags li { line-height: 36px; margin: 0; padding-left: 5px; - border: #cce6ec 3px solid; width: 100%; /*719px;*/ @@ -1691,7 +1695,6 @@ ul#related-tags li { .ask-page #id_tags, .edit-question-page #id_tags { box-sizing: border-box; - border: #cce6ec 3px solid; height: 31px; padding-left: 5px; font-size: 14px; @@ -1710,7 +1713,6 @@ ul#related-tags li { .question-page #id_post_author_email, .edit-question-page #id_post_author_email, .edit-answer-page #id_post_author_email { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -1763,7 +1765,6 @@ ul#related-tags li { } #id_user, #id_user_author { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -1790,7 +1791,6 @@ ul#related-tags li { } #id_user, #id_user_author { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -1820,7 +1820,6 @@ ul#related-tags li { margin-right: 7px; } .folded-editor { - border: #cce6ec 3px solid; height: 100px; outline: none; width: 100%; @@ -2011,7 +2010,6 @@ ul#related-tags li { height: 36px; margin: 0px; padding: 0px 0 0 5px; - border: #cce6ec 3px solid; width: 100%; margin-bottom: 10px; box-sizing: border-box; @@ -2021,7 +2019,6 @@ ul#related-tags li { .edit-question-page #id_summary, #fmedit #id_summary, .wmd-preview #id_summary { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -2373,7 +2370,6 @@ ul#related-tags li { } .question-page .comments textarea { box-sizing: border-box; - border: #cce6ec 3px solid; color: #666; font-family: Arial; font-size: 13px; @@ -2660,7 +2656,7 @@ ul#related-tags li { } .box.vote-buttons { display: block; - width: 100%; + width: 100% !important; } .question-img-upvote, .question-img-downvote, @@ -2775,7 +2771,6 @@ ul#related-tags li { .users-page select, .user-profile-edit-page select, .user-profile-page select { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -2795,7 +2790,6 @@ ul#related-tags li { .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { - border: #cce6ec 3px solid; padding-left: 5px; padding-top: 5px; width: 395px; @@ -2879,7 +2873,6 @@ ul#related-tags li { height: 20px; margin: 0px; padding: 0px 0 0 5px; - border: #cce6ec 3px solid; width: 200px; } .openid-input { diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index aaedd053..a9c4f8fa 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -52,6 +52,14 @@ textarea:focus, input:focus{ outline: none; } +input[type="text"], +input[type="password"], +select, +textarea, +#askFormBar .questionTitleInput { + border: #cce6ec 3px solid; +} + iframe { border: none; } @@ -481,7 +489,6 @@ body.user-messages { } #validation-code { padding-left:5px; - border:#cce6ec 3px solid; height:25px; font-size: 14px; width: 200px; @@ -517,7 +524,7 @@ body.user-messages { height: 26px; line-height: 26px; font-weight:300; - background:#FFF; + background: transparent; border:0px; color:#484848; font-family:@body-font; @@ -543,7 +550,7 @@ body.user-messages { box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - width: 100%a + width: 100%; } input[type="submit"].searchBtn { @@ -1230,7 +1237,6 @@ ul#searchTags { #question-list { float: left; position: relative; - background-color: #FFF; padding: 0; width: 100%; } @@ -1725,7 +1731,6 @@ ul#related-tags li { line-height: 36px; margin: 0; padding-left: 5px; - border:#cce6ec 3px solid; width: 100%;/*719px;*/ box-sizing: border-box; -moz-box-sizing: border-box; @@ -1792,7 +1797,6 @@ ul#related-tags li { #id_tags { box-sizing: border-box; - border: #cce6ec 3px solid; height: 31px; padding-left: 5px; font-size: 14px; @@ -1810,7 +1814,6 @@ ul#related-tags li { .edit-answer-page { #id_post_author_username, #id_post_author_email { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -1861,7 +1864,6 @@ ul#related-tags li { #id_user, #id_user_author { - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -1892,7 +1894,6 @@ ul#related-tags li { #id_user, #id_user_author { - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -1925,7 +1926,6 @@ ul#related-tags li { } .folded-editor { - border:#cce6ec 3px solid; height: 100px; outline: none; width: 100%; @@ -1951,7 +1951,7 @@ ul#related-tags li { } .wmd-container { - border:#cce6ec 3px solid; + border: #cce6ec 3px solid; textarea { border: none; } @@ -2128,7 +2128,6 @@ ul#related-tags li { height: 36px; margin: 0px; padding: 0px 0 0 5px; - border:#cce6ec 3px solid; width: 100%; margin-bottom:10px; box-sizing: border-box; @@ -2136,7 +2135,6 @@ ul#related-tags li { -webkit-box-sizing: border-box; } #id_summary{ - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -2491,7 +2489,6 @@ ul#related-tags li { textarea { box-sizing: border-box; - border: #cce6ec 3px solid; color: #666; font-family: @body-font; font-size: 13px; @@ -2805,7 +2802,7 @@ ul#related-tags li { .box.vote-buttons { display: block; - width: 100%; + width: 100% !important; } .question-img-upvote, .question-img-downvote, @@ -2905,7 +2902,6 @@ ul#related-tags li { input[type="text"], input[type="password"], select{ - border:#cce6ec 3px solid; height:25px; line-height: 25px; padding-left:5px; @@ -2917,7 +2913,6 @@ ul#related-tags li { height:30px; } textarea{ - border:#cce6ec 3px solid; padding-left:5px; padding-top:5px; width:395px; @@ -2981,7 +2976,6 @@ ul#related-tags li { height: 20px; margin: 0px; padding: 0px 0 0 5px; - border:#cce6ec 3px solid; width:200px; } } diff --git a/askbot/templates/base.html b/askbot/templates/base.html index a3bb2173..332fa093 100644 --- a/askbot/templates/base.html +++ b/askbot/templates/base.html @@ -4,6 +4,7 @@ <head> <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=EDGE" /> {% block meta_description %} <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" /> {% endblock %} diff --git a/askbot/templates/question.html b/askbot/templates/question.html index a8aef0a7..7e8d33ef 100644 --- a/askbot/templates/question.html +++ b/askbot/templates/question.html @@ -44,7 +44,12 @@ }; var getTextContent = function(node) { - return node.innerText || node.textContent; + var text = node.innerText || node.textContent; + if (text === undefined) { + return ''; + } else { + return text; + } }; var hasAttribute = function(node, attrName) { diff --git a/askbot/templates/user_profile/user_network.html b/askbot/templates/user_profile/user_network.html index 51de7b55..ce13d5c4 100644 --- a/askbot/templates/user_profile/user_network.html +++ b/askbot/templates/user_profile/user_network.html @@ -11,7 +11,6 @@ {{ macros.user_list( followers, - profile_section = 'network', karma_mode = settings.KARMA_MODE, badges_mode = settings.BADGES_MODE ) @@ -22,7 +21,6 @@ {{ macros.user_list( followed_users, - profile_section = 'network', karma_mode = settings.KARMA_MODE, badges_mode = settings.BADGES_MODE ) diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py index 2620d6b8..b8896ba0 100644 --- a/askbot/tests/page_load_tests.py +++ b/askbot/tests/page_load_tests.py @@ -799,3 +799,14 @@ class UserProfilePageTests(AskbotTestCase): user = self.reload_object(self.user) self.assertEqual(user.username, 'edited') self.assertEqual(user.email, 'new@example.com') + + def test_user_network(self): + user2 = self.create_user('user2') + user2.follow_user(self.user) + self.user.follow_user(user2) + name_slug = slugify(self.user.username) + kwargs={'id': self.user.id, 'slug': name_slug} + url = reverse('user_profile', kwargs=kwargs) + response = self.client.get(url, data={'sort':'network'}) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.templates[0].name, 'user_profile/user_network.html') |