Mercurial > public > sg101

changeset 716:f68694669023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with maintenance work.
author Brian Neal <bgneal@gmail.com>
date Tue, 17 Sep 2013 21:13:31 -0500
parents 13a1713d05b5 (current diff) 820e57e621e8 (diff)
children 846cf9a06a04
files
diffstat 12 files changed, 46 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/messages/static/js/tabbed_messages.js	Tue Sep 17 17:54:21 2013 -0500
+++ b/messages/static/js/tabbed_messages.js	Tue Sep 17 21:13:31 2013 -0500
@@ -18,7 +18,13 @@
       },
       load: function(event, ui) {
          selectedTab = ui;
-         if (doReply && ui.tab.index() == 1)
+
+         if (ui.tab.index() == 1 && receiver && !doReply)
+         {
+            $('#id_receiver').val(receiver);
+            receiver = '';
+         }
+         else if (doReply && ui.tab.index() == 1)
          {
             doReply = false;
             var msg = msgCache[$msgDialog.msgId];
--- a/requirements.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/requirements.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,4 +1,4 @@
-Django==1.5.2
+Django==1.5.4
 Markdown==2.3.1
 MySQL-python==1.2.4
 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-dev
--- a/requirements_dev.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/requirements_dev.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,4 +1,4 @@
-Django==1.5.2
+Django==1.5.4
 Markdown==2.3.1
 MySQL-python==1.2.4
 django-debug-toolbar==0.9.4
--- a/sg101/templates/search/indexes/bio/userprofile_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/bio/userprofile_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,11 +1,11 @@
-{{ object.user.username }}
-{{ object.user.get_full_name }}
-{{ object.location }}
-{{ object.occupation }}
-{{ object.interests }}
-{{ object.profile_text }}
-{{ object.signature }}
+{{ object.user.username|safe }}
+{{ object.user.get_full_name|safe }}
+{{ object.location|safe }}
+{{ object.occupation|safe }}
+{{ object.interests|safe }}
+{{ object.profile_text|safe }}
+{{ object.signature|safe }}
 {% for website in object.user.website_profiles.all %}
-{{ website.name }}
+{{ website.name|safe }}
 {{ website.url }}
 {% endfor %}
--- a/sg101/templates/search/indexes/downloads/download_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/downloads/download_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,4 +1,4 @@
-{{ object.title }}
-{{ object.user.username }}
-{{ object.user.get_full_name }}
-{{ object.description }}
+{{ object.title|safe }}
+{{ object.user.username|safe }}
+{{ object.user.get_full_name|safe }}
+{{ object.description|safe }}
--- a/sg101/templates/search/indexes/forums/post_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/forums/post_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,3 +1,3 @@
-{{ object.user.username }}
-{{ object.user.get_full_name }}
-{{ object.body }}
+{{ object.user.username|safe }}
+{{ object.user.get_full_name|safe }}
+{{ object.body|safe }}
--- a/sg101/templates/search/indexes/forums/topic_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/forums/topic_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,3 +1,3 @@
-{{ object.name }}
-{{ object.user.username }}
-{{ object.user.get_full_name }}
+{{ object.name|safe }}
+{{ object.user.username|safe }}
+{{ object.user.get_full_name|safe }}
--- a/sg101/templates/search/indexes/news/story_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/news/story_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,6 +1,6 @@
-{{ object.title }}
-{{ object.submitter.username }}
-{{ object.submitter.get_full_name }}
-{{ object.short_text }}
-{{ object.long_text }}
-{{ object.tags }}
+{{ object.title|safe }}
+{{ object.submitter.username|safe }}
+{{ object.submitter.get_full_name|safe }}
+{{ object.short_text|safe }}
+{{ object.long_text|safe }}
+{{ object.tags|safe }}
--- a/sg101/templates/search/indexes/podcast/item_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/podcast/item_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,5 +1,5 @@
-{{ object.title }}
-{{ object.author }}
-{{ object.subtitle }}
-{{ object.summary }}
-{{ object.keywords }}
+{{ object.title|safe }}
+{{ object.author|safe }}
+{{ object.subtitle|safe }}
+{{ object.summary|safe }}
+{{ object.keywords|safe }}
--- a/sg101/templates/search/indexes/weblinks/link_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/weblinks/link_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,5 +1,5 @@
-{{ object.title }}
+{{ object.title|safe }}
 {{ object.url }}
-{{ object.user.username }}
-{{ object.user.get_full_name }}
-{{ object.description }}
+{{ object.user.username|safe }}
+{{ object.user.get_full_name|safe }}
+{{ object.description|safe }}
--- a/sg101/templates/search/indexes/ygroup/post_text.txt	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/indexes/ygroup/post_text.txt	Tue Sep 17 21:13:31 2013 -0500
@@ -1,2 +1,2 @@
-{{ object.title }}
-{{ object.msg }}
+{{ object.title|safe }}
+{{ object.msg|safe }}
--- a/sg101/templates/search/search.html	Tue Sep 17 17:54:21 2013 -0500
+++ b/sg101/templates/search/search.html	Tue Sep 17 21:13:31 2013 -0500
@@ -9,13 +9,13 @@
       var chkboxes = $('#search-form input[type="checkbox"]');
       $('#chk_all').click(function() {
          chkboxes.each(function(index) {
-            $(this).attr('checked', true);
+            $(this).prop('checked', true);
          });
          return false;
       });
       $('#chk_none').click(function() {
          chkboxes.each(function(index) {
-            $(this).attr('checked', false);
+            $(this).prop('checked', false);
          });
          return false;
       });