diff options
| author | Dejan Noveski <dr.mote@gmail.com> | 2011-11-21 19:35:25 +0100 |
|---|---|---|
| committer | Dejan Noveski <dr.mote@gmail.com> | 2011-11-21 19:35:25 +0100 |
| commit | b270a36cef307261b0097fae3899948766a1f4e1 (patch) | |
| tree | 8a346087a324ec1f710ed80b782afd3045fe5822 | |
| parent | 2eaf4df2c20b4fa0fed3b9e66f7d923850014103 (diff) | |
| parent | 14fc18e71f598bb7548848ed0cb840693ae6b9fd (diff) | |
| download | askbot-b270a36cef307261b0097fae3899948766a1f4e1.tar.gz askbot-b270a36cef307261b0097fae3899948766a1f4e1.tar.bz2 askbot-b270a36cef307261b0097fae3899948766a1f4e1.zip | |
Merge branch 'master' of git://github.com/ASKBOT/askbot-devel
56 files changed, 10744 insertions, 3055 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 901a8529..0ada3395 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -7,12 +7,14 @@ Development version (not yet published) * Implemented new version of skin (Byron Corrales) * Show unused vote count (Tomasz Zielinski) * Categorized live settings (Evgeny) +* Merge users management command (Daniel Mican) * Added management command ``send_accept_answer_reminders`` (Evgeny) * Improved the ``askbot-setup`` script (Adolfo, Evgeny) * Merge users management command (Daniel Mican) * Anonymous caching of the question page (Vlad Bokov) * Fixed sharing button bug, css fixes for new template (Alexander Werner) * Added ASKBOT_TRANSLATE_URL setting for url localization(Alexander Werner) +* Changed javascript translation model, moved from jqueryi18n to django(Rosandra Cuello Suñol) 0.7.26 (Current Version) diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst index c2ba76b8..3d1303c1 100644 --- a/askbot/doc/source/contributors.rst +++ b/askbot/doc/source/contributors.rst @@ -31,6 +31,7 @@ Programming and documentation * `Tomasz Szynalski <http://antimoon.com>`_ * `Raghu Udiyar <http://raags.tumblr.com/>`_ * Alexander Werner +* Rosandra Cuello Suñol Translations ------------ diff --git a/askbot/locale/de/LC_MESSAGES/djangojs.mo b/askbot/locale/de/LC_MESSAGES/djangojs.mo Binary files differindex 7e87fdc8..71a9a6cb 100644 --- a/askbot/locale/de/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/de/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/de/LC_MESSAGES/djangojs.po b/askbot/locale/de/LC_MESSAGES/djangojs.po index 4fdeb3e9..6d48c0bb 100644 --- a/askbot/locale/de/LC_MESSAGES/djangojs.po +++ b/askbot/locale/de/LC_MESSAGES/djangojs.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:24-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" +"PO-Revision-Date: 2011-09-28 04:28-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -17,49 +17,344 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "Lade..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "Tags dürfen nicht leer sein" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "Inhalt darf nicht leer sein" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "Bitte mindestens {0} Zeichen eingeben" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "Bitte Titel eingeben" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "Bitte mindestens {0} Zeichen eingeben" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "nicht genügend Rechte" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "Eigene Antworten können nicht als die korrekte akzeptiert werden" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "Bitte einloggen" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "Gastbenutzer können nicht abstimmen " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "Bitte beleidigenden/regelwidrigen Beitrag bestätigen" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "Gastbenutzer können Beiträge nicht melden" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "Löschen bestätigen" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "Gastbenutzer können Beiträge nicht löschen oder wiederherstellen" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "Beitrag wiederhergestellt" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "Beitrag gelöscht" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "wiederherstellen" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "löschen" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "OK" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "%s characters left" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "Diesen Kommentar löschen" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "Löschen des Kommentars bestätigen" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "Fett" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "Kursiv" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "Link" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "Zitat" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "Vorformatierter Text" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "Bild" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "Nummerierte Liste" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "Liste" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "Titel" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "horizontaler Balken" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "Rückgängig" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "Wiederholen" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "Bild-URL eingeben, zum Beispiel <br />http://www.ihredomain.de/bildname.jpg" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "URL eingeben, zum Beispiel <br />http://www.askbot.org/ </p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + diff --git a/askbot/locale/en/LC_MESSAGES/djangojs.mo b/askbot/locale/en/LC_MESSAGES/djangojs.mo Binary files differindex 674f4542..0e0ba6f8 100644 --- a/askbot/locale/en/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/en/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/en/LC_MESSAGES/djangojs.po b/askbot/locale/en/LC_MESSAGES/djangojs.po index 3d39c7d3..692c0368 100644 --- a/askbot/locale/en/LC_MESSAGES/djangojs.po +++ b/askbot/locale/en/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:25-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,332 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: skins/default/media/js/post.js:532 -msgid "Follow" +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "please enter at least one tag" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "please enter more than {0} characters" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "please enter at least {0} characters" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "sorry, you cannot accept your own answer" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "sorry, anonymous users cannot vote " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "are you sure this post is offensive, contains spam, advertising, malicious remarks, etc.?" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "are you sure you want to delete this?" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "sorry, anonymous users cannot delete or undelete posts" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "your post is now restored!" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "your post has been deleted" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 +msgid "Follow" +msgstr "Follow" + +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" +msgstr "<div>Following</div><div class=\"unfollow\">Unfollow</div>" + +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "save comment" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "please enter at least {0} more characters" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "Are you sure you do not want to post this comment?" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "do you really want to delete this comment?" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "click to edit this comment" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "edit" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "enter URL of the image, e.g. http://www.example.com/image.jpg or upload an image file" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "enter Web address, e.g. http://www.example.com \"page title\"" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "Please choose and upload a file:" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/es/LC_MESSAGES/djangojs.mo b/askbot/locale/es/LC_MESSAGES/djangojs.mo Binary files differindex 462417d2..b6e2eb66 100644 --- a/askbot/locale/es/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/es/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/es/LC_MESSAGES/djangojs.po b/askbot/locale/es/LC_MESSAGES/djangojs.po index 57d10b13..a5dc9d4c 100644 --- a/askbot/locale/es/LC_MESSAGES/djangojs.po +++ b/askbot/locale/es/LC_MESSAGES/djangojs.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:25-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" +"PO-Revision-Date: 2011-09-28 04:20-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -17,49 +17,344 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "cargando..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "las etiquetas no pueden estar vacías" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "el contenido no puede estar vacío" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "por favor introduzca mas de {0} caracteres" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "por favor ingrese un título" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "por favor introduzca al menos {0} caracteres" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "privilegio insuficiente" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "no puede escoger su propia respuesta como la mejor" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "por favor inicie sesión" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "usuarios anónimos no pueden votar" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "por favor confirme ofensiva" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "usuarios anónimos no pueden marcar publicaciones como ofensivas" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "¿Está seguro que desea borrar esto?" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "usuarios anónimos no pueden borrar o recuperar publicaciones" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "publicación recuperada" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "publicación borrada。" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "recuperar" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "borrar" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "agregar comentario" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "%s caracteres faltantes" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "borrar este comentario" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "¿Realmente desea borrar este comentario?" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "negrita" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "cursiva" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "enlace" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "citar" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "texto preformateado" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "imagen" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "lista numerada" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "lista no numerada" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "encabezado" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "barra horizontal" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "deshacer" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "rehacer" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "introduzca la URL de la imagen, por ejemplo：<br />http://www.example.com/image.jpg \"titulo de imagen\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/ \"titulo del enlace\"</p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + diff --git a/askbot/locale/fi/LC_MESSAGES/djangojs.mo b/askbot/locale/fi/LC_MESSAGES/djangojs.mo Binary files differindex 0be0e2e5..ec5b9631 100644 --- a/askbot/locale/fi/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/fi/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/fi/LC_MESSAGES/djangojs.po b/askbot/locale/fi/LC_MESSAGES/djangojs.po index 78b1f23e..d98fb20e 100644 --- a/askbot/locale/fi/LC_MESSAGES/djangojs.po +++ b/askbot/locale/fi/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:26-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,332 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "anna vähintään yksi tagi" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "syötä vähintään {0} merkkiä" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "syötä vähintään {0} merkkiä" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "et voi hyväksyä omaa vastaustasi parhaaksi" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "kirjaudu sisään, jotta voit käyttää tätä ominaisuutta " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "oletko varma, että tämä on roskaposti, loukkaava tai muuta hyväksymätöntä?" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "oletko varma, että haluat poistaa tämän?" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "kirjaudu sisään, jotta voit käyttää tätä ominaisuutta" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "postauksesi on palautettu!" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "postauksesi on poistettu" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "%s merkkiä jäljellä" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "oletko varma, että haluat poistaa tämän kommentin?" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "Anna kuvan URL-osoite, esim. http://www.example.com/image.jpg \"kuvan otsikko\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "Anna URL-osoite, esim. http://www.example.com \"sivun otsikko\"" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/fr/LC_MESSAGES/djangojs.mo b/askbot/locale/fr/LC_MESSAGES/djangojs.mo Binary files differindex 386cff64..0a8cfd17 100644 --- a/askbot/locale/fr/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/fr/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/fr/LC_MESSAGES/djangojs.po b/askbot/locale/fr/LC_MESSAGES/djangojs.po index 96c21a1c..52594fab 100644 --- a/askbot/locale/fr/LC_MESSAGES/djangojs.po +++ b/askbot/locale/fr/LC_MESSAGES/djangojs.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:27-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" +"PO-Revision-Date: 2011-09-28 08:12-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -17,49 +17,344 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "Chargement en cours..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "Les mots-clés ne doivent pas être vides" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "Le contenu ne doit pas être vide" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "Veuillez saisir au moins {0} caractères" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "Veuillez saisir un titre" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "Veuillez saisir au moins {0} caractères" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "Privilèges insuffisants" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "Vous ne pouvez pas désigner une de vos propres réponses comme étant la meilleure réponse" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "Veuillez vous authentifier" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "les utilisateurs anonyment ne peuvent pas voter " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "Veuillez confirmer que le contenu est abusif" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "Les utilisateurs anonymes ne peuvent pas signaler les messages à contenu abusif" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "Confirmer la suppression" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "Les utilisateurs anonymes ne peuvent pas supprimer/restaurer" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "Message restauré" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "Message supprimé" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "Restaurer" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "supprimer" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "OK" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "supprimer ce commentaire" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "Confirmer la suppression du commentaire" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "gras" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "italique" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "lien" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "Citer" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "Texte préformaté" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "Image" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "liste numérotée" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "liste" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "Titre" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "Barre horizontale" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "Annuler" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "Rétablir" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "Veuillez saisir une URL menant à une image, par exemple <br />http://www.votre-domaine.com/nom-image.jpg" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "Entrez une URL, par exemple <br />http://www.askbot.org/ </p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + diff --git a/askbot/locale/it/LC_MESSAGES/djangojs.mo b/askbot/locale/it/LC_MESSAGES/djangojs.mo Binary files differindex e51c1286..cd794c2b 100644 --- a/askbot/locale/it/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/it/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/it/LC_MESSAGES/djangojs.po b/askbot/locale/it/LC_MESSAGES/djangojs.po index ce10412c..8077b936 100644 --- a/askbot/locale/it/LC_MESSAGES/djangojs.po +++ b/askbot/locale/it/LC_MESSAGES/djangojs.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:27-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" +"PO-Revision-Date: 2011-09-28 08:20-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -17,49 +17,344 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "Caricamento..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "Il campo Tags non può essere vuoto" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "il contenuto non può essere vuoto" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "per favore inserisci più di {0} caratteri" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "Per favore inserisci il titolo" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "per favore inserisci almeno {0} caratteri" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "privilegi non sufficienti" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "non è possibile assegnare come miglior risposta ad una propria domanda una propria risposta" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "Per favore effettua il login" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "Gli utenti anonimi non possono votare " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "sei certo che questo post sia offensivo, contenga spam, pubblicità, osservazioni poco idonee, ecc.?" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "Gli utenti anonimi non possono flaggare come offensivo questo post" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "conferma la cancellazione" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "Gli utenti anonimi non possono cancellare/annullare la cancellazione" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "Post recuperato" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "Post eliminato" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "elimina" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "elimina" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "OK" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "%s caratteri rimanenti" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "Elimina questo commento" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "Vuoi davvero cancellare il commento?" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "grassetto" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "corsivo" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "Link" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "cita" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "Testo preformattato" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "Immagine" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "Lista numerata" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "Lista" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "Titolo" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "barra orizzontale" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "annulla" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "Esegui nuovamente" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "inserisci l'URL dell'immagine, es. http://www.example.com/immagine.jpg \"titolo immagine\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "inserisci l'indirizzo web, e.g. <br />http://www.askbot.org/ </p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + diff --git a/askbot/locale/ja/LC_MESSAGES/djangojs.mo b/askbot/locale/ja/LC_MESSAGES/djangojs.mo Binary files differindex a0e8222d..7bb76233 100644 --- a/askbot/locale/ja/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/ja/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/ja/LC_MESSAGES/djangojs.po b/askbot/locale/ja/LC_MESSAGES/djangojs.po index 9dc61083..fdbc6f65 100644 --- a/askbot/locale/ja/LC_MESSAGES/djangojs.po +++ b/askbot/locale/ja/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:28-0500\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,331 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/ko/LC_MESSAGES/djangojs.mo b/askbot/locale/ko/LC_MESSAGES/djangojs.mo Binary files differindex 94448970..ac9345ee 100644 --- a/askbot/locale/ko/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/ko/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/ko/LC_MESSAGES/djangojs.po b/askbot/locale/ko/LC_MESSAGES/djangojs.po index b033cb97..7cec7ad6 100644 --- a/askbot/locale/ko/LC_MESSAGES/djangojs.po +++ b/askbot/locale/ko/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:29-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,331 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.mo b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.mo Binary files differindex 1b7fa761..673ea50c 100644 --- a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po index eb07cced..cba62186 100644 --- a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:35-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,332 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/ro/LC_MESSAGES/djangojs.mo b/askbot/locale/ro/LC_MESSAGES/djangojs.mo Binary files differindex 6701db6d..06702fae 100644 --- a/askbot/locale/ro/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/ro/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/ro/LC_MESSAGES/djangojs.po b/askbot/locale/ro/LC_MESSAGES/djangojs.po index b6f24438..988f77ca 100644 --- a/askbot/locale/ro/LC_MESSAGES/djangojs.po +++ b/askbot/locale/ro/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:30-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,49 +18,333 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/ru/LC_MESSAGES/djangojs.mo b/askbot/locale/ru/LC_MESSAGES/djangojs.mo Binary files differindex a4408153..80e49dd0 100644 --- a/askbot/locale/ru/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/ru/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/ru/LC_MESSAGES/djangojs.po b/askbot/locale/ru/LC_MESSAGES/djangojs.po index a92490fb..a4709cf8 100644 --- a/askbot/locale/ru/LC_MESSAGES/djangojs.po +++ b/askbot/locale/ru/LC_MESSAGES/djangojs.po @@ -7,69 +7,362 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:30-0500\n" -"PO-Revision-Date: 2011-09-05 09:02\n" -"Last-Translator: <efadeev@uci.edu>\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" +"PO-Revision-Date: 2011-09-28 08:02-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" "X-Translated-Using: django-rosetta 0.6.2\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "Вы действительно хотите удалить логин через %s?" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "Пожалуйста, добавьте хотя бы один постоянный метод для авторизации." + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "У Вас сейчас нет постоянного метода авторизации, пожалуйста выберите хотя бы один, нажав на любую из предложеных ниже кнопок." + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "пароли не совпадают" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "Просмотреть, изменить существующие методы авторизации." + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "Чтобы продолжить, пожалуйста введите %s" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "Соедините %(site)s с Вашим аккаунтом от %(provider_name)s" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "Измените Ваш пароль для %s" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "Изменить пароль" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "Создать пароль для %s" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "Создать пароль" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "Создать аккаунт, защищенный паролем" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "загрузка..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "введите теги" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "пожалуйста, добавьте содержание" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "содержание должно быть более {0} символов" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "пожалуйста, введите заголовок" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "заголовок должен быть более {0} символов" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "недостаточно прав" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "Извините, выбрать собственный ответ в качестве лучшего не разрешается" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "введите логин" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "Извините, но для того чтобы голосовать, " + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "Вы уверены что это сообщение неуместно?" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "Извините, но для того чтобы пожаловаться на сообщение, " + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "Удалить?" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "неавторизированные пользователи не могут восстанавливать и удалять сообщения " + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "восстановить сообщение" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "сообщение удалено" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "Добавить закладку" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "%s закладка" msgstr[1] "%s закладки" msgstr[2] "%s закладок" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "<div>Есть закладка!</div><div class=\"unfollow\">Убрать закладку</div>" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "восстановить" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "удалить" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "добавить комментарий" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "сохранить комментарий" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "недостаточно символов, пожалуйста, добавьте ещё {0}" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "осталось место для %s символов" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "удалить этот комментарий" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "Удалить комментарий?" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "Пожалуйста, добавьте заглавие к вопросу (>10 букв)" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "Тег \"<span></span>\" подходит для:" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "и ещё %s, не показано..." +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "Пожалуйста, отметьте хотя бы одно извещение" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "Удалить это извещение?" +msgstr[1] "Удалить эти извещения?" +msgstr[2] "Удалить эти извещения?" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" -msgstr "" -"Пожалуйста <a href=\"%(signin_url)s\">авторизуйтесь</a> чтобы отметить " -"профиль %(username)s" +msgstr "Пожалуйста <a href=\"%(signin_url)s\">авторизуйтесь</a> чтобы отметить профиль %(username)s" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "нажмите здесь, чтобы отредактировать этот комментарий" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "редактировать" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "смотрите вопросы, помеченные '%s'" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "жирный" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "курсив" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "ссылка" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "цитата" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "форматирование текста" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "изображение" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "пронумерованный список" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "маркированный список" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "заголовок" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "горизонтальная полоса" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "отменить" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "повторить" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "введите url изображения, например:<br /> http://www.domain.ru/kartinka.gif" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "введите url, например:<br />http://www.domain.ru/ </p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "загрузить файл" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "название файла" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + #~ msgid "%(q_num)s question" + #~ msgid_plural "%(q_num)s questions" #~ msgstr[0] "%(q_num)s вопрос" #~ msgstr[1] "%(q_num)s вопроса" diff --git a/askbot/locale/sr/LC_MESSAGES/djangojs.mo b/askbot/locale/sr/LC_MESSAGES/djangojs.mo Binary files differindex 2c8ecbcf..4880c727 100644 --- a/askbot/locale/sr/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/sr/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/sr/LC_MESSAGES/djangojs.po b/askbot/locale/sr/LC_MESSAGES/djangojs.po index 91b621d4..f3f038d0 100644 --- a/askbot/locale/sr/LC_MESSAGES/djangojs.po +++ b/askbot/locale/sr/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:31-0500\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,49 +18,333 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/tr/LC_MESSAGES/djangojs.mo b/askbot/locale/tr/LC_MESSAGES/djangojs.mo Binary files differindex 36a5bdfa..6545f119 100644 --- a/askbot/locale/tr/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/tr/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/tr/LC_MESSAGES/djangojs.po b/askbot/locale/tr/LC_MESSAGES/djangojs.po index 5872aa10..22e96e6c 100644 --- a/askbot/locale/tr/LC_MESSAGES/djangojs.po +++ b/askbot/locale/tr/LC_MESSAGES/djangojs.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:32-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" +"PO-Revision-Date: 2011-09-28 04:13-0800\n" +"Last-Translator: Rosandra Cuello <rosandra.cuello@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -17,49 +17,344 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "You don't have a method to log in right now, please add one or more by clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "yükleniyor..." + +#: skins/common/media/js/post.js:127 +#: skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "etiketler boş olamaz" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "içerik boş olamaz" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "Lütfen en az (0) karakter girin" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "lütfen bir başlık yazın" + +#: skins/common/media/js/post.js:138 +#: skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "Lütfen en az (0) karakter girin" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "buna yetkiniz yoktur" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "en cevap olarak kendi cevabınızı seçemezsiniz" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "lütfen üye girişi yapınız" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "üye girişi yapmadan oy kullanamazsınız" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "şikayetinizi onaylayın" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "üye girişi yapmadan şikayet gönderemezsiniz" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "Bunu silmek istediğinizden emin misiniz?" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "üye girişi yapmadan yazı silemez yada geri alamazsınız" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "yazı geri alındı" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "yazı silindi" + +#: skins/common/media/js/post.js:536 +#: skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 +#: skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 +#: skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 +#: skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 +#: skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "geri al" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "sil" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "yorum ekle" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "yazılabilir %s karakter eksik" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "bu yorumu sil" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "yorumu silmek istediğinizden emin misiniz?" + +#: skins/common/media/js/post.js:1622 +#: skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" +msgstr[1] "" + +#: skins/common/media/js/user.js:125 #: skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" +#: skins/common/media/js/user.js:157 #: skins/default/media/js/user.js:161 -#, perl-format +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" +#: skins/common/media/js/user.js:160 #: skins/default/media/js/user.js:164 -#, perl-format +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" +#: skins/common/media/js/user.js:166 #: skins/default/media/js/user.js:170 -#, perl-format +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "kalın" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "italik" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "link" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "alıntı" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "hazır metin" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "resimler" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "numaralı liste" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "işaretli liste" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "Başlık" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "yatay bar" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "geri" + +#: skins/common/media/js/wmd/wmd.js:42 +#: skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "yeniden" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "örnek resmin URLsini girin： <br />http://www.example.com/image.jpg \"resim başlığı\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "web adresini girin： <br />http://www.cnprog.com/ \"başlık bağlantısı\"</p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" + diff --git a/askbot/locale/vi/LC_MESSAGES/djangojs.mo b/askbot/locale/vi/LC_MESSAGES/djangojs.mo Binary files differindex 497e70f5..ac9345ee 100644 --- a/askbot/locale/vi/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/vi/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/vi/LC_MESSAGES/djangojs.po b/askbot/locale/vi/LC_MESSAGES/djangojs.po index 3448d342..7cec7ad6 100644 --- a/askbot/locale/vi/LC_MESSAGES/djangojs.po +++ b/askbot/locale/vi/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:33-0500\n" +"POT-Creation-Date: 2011-09-28 00:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,331 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "" + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo b/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo Binary files differindex 496607ae..4d81cbf2 100644 --- a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po b/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po index 7e7b0ccb..dbd7b604 100644 --- a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po +++ b/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:50-0500\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,331 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "讀取中..." + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "標籤不能為空白" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "內容不能為空白" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "請輸入至少 {0} 字符。" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "請輸入標題。" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "請輸入至少 {0} 字符。" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "權限不足" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "不能蔽掃自珍" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "請先登錄" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "確定要歸類該帖為廣告、人身攻擊、惡意言論嗎？" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "匿名用戶不能操作" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "確定刪除" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "匿名用戶不能刪除或恢復帖子" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "操作成功！該帖子已被恢複。" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "操作成功！該帖子已刪除。" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "取消" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "刪除" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "添加評論" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "還可寫%s字" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "刪除此評論" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "刪除評論確認" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "點擊消息框關閉" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "粗體" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "斜體" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "超連接" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "引用" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "代碼" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "圖片" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "數字編號列表" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "項目符號列表" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "標題" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "水平線" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "撤銷" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "重做" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "<b>輸入圖片地址</b></p><p>示例：<br />http://www.example.com/image.jpg \"我的截圖\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "<b>輸入Web地址</b></p><p>示例：<br />http://www.cnprog.com/ \"我的網站\"</p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.mo b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.mo Binary files differindex 497e70f5..594e1f99 100644 --- a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.mo +++ b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.mo diff --git a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po index 3448d342..895e57fe 100644 --- a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 02:33-0500\n" +"POT-Creation-Date: 2011-09-28 00:32-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,49 +17,331 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: skins/default/media/js/post.js:532 +#: skins/common/media/jquery-openid/jquery.openid.js:73 +#, c-format +msgid "Are you sure you want to remove your %s login?" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:90 +msgid "Please add one or more login methods." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:93 +msgid "" +"You don't have a method to log in right now, please add one or more by " +"clicking any of the icons below." +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:135 +msgid "passwords do not match" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:162 +msgid "Show/change current login methods" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:223 +#, c-format +msgid "Please enter your %s, then proceed" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:225 +msgid "Connect your %(provider_name)s account to %(site)s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:319 +#, c-format +msgid "Change your %s password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:320 +msgid "Change password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:323 +#, c-format +msgid "Create a password for %s" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:324 +msgid "Create password" +msgstr "" + +#: skins/common/media/jquery-openid/jquery.openid.js:340 +msgid "Create a password-protected account" +msgstr "" + +#: skins/common/media/js/post.js:28 +msgid "loading..." +msgstr "读取中..." + +#: skins/common/media/js/post.js:127 skins/common/media/js/post.js.c:856 +msgid "tags cannot be empty" +msgstr "标签不能为空。" + +#: skins/common/media/js/post.js:133 +msgid "content cannot be empty" +msgstr "内容不能为空。" + +#: skins/common/media/js/post.js:134 +msgid "content minchars" +msgstr "请输入至少 {0} 字符。" + +#: skins/common/media/js/post.js:137 +msgid "please enter title" +msgstr "请输入标题。" + +#: skins/common/media/js/post.js:138 skins/common/media/js/post.js.c:981 +msgid "title minchars" +msgstr "请输入至少 {0} 字符。" + +#: skins/common/media/js/post.js:281 +msgid "insufficient privilege" +msgstr "用户权限不在操作范围" + +#: skins/common/media/js/post.js:282 +msgid "cannot pick own answer as best" +msgstr "不能设置自己的回答为最佳答案" + +#: skins/common/media/js/post.js:287 +msgid "please login" +msgstr "注册或者登录" + +#: skins/common/media/js/post.js:289 +msgid "anonymous users cannot follow questions" +msgstr "" + +#: skins/common/media/js/post.js:290 +msgid "anonymous users cannot subscribe to questions" +msgstr "" + +#: skins/common/media/js/post.js:291 +msgid "anonymous users cannot vote" +msgstr "" + +#: skins/common/media/js/post.js:293 +msgid "please confirm offensive" +msgstr "确定要归类该帖为广告、人身攻击、恶意言论吗？" + +#: skins/common/media/js/post.js:294 +msgid "anonymous users cannot flag offensive posts" +msgstr "匿名用户不能操作，请先" + +#: skins/common/media/js/post.js:295 +msgid "confirm delete" +msgstr "确定要删除/撤销删除该帖吗？" + +#: skins/common/media/js/post.js:296 +msgid "anonymous users cannot delete/undelete" +msgstr "匿名用户不能删除或撤销删除帖子" + +#: skins/common/media/js/post.js:297 +msgid "post recovered" +msgstr "操作成功！该帖子已被恢复。" + +#: skins/common/media/js/post.js:298 +msgid "post deleted" +msgstr "操作成功！该帖子已删除。" + +#: skins/common/media/js/post.js:536 skins/default/media/js/post.js:535 +#: skins/old/media/js/post.js:535 msgid "Follow" msgstr "" -#: skins/default/media/js/post.js:541 skins/default/media/js/post.js.py:550 -#, perl-format +#: skins/common/media/js/post.js:545 skins/common/media/js/post.js.c:554 +#: skins/default/media/js/post.js:544 skins/default/media/js/post.js.c:553 +#: skins/old/media/js/post.js:544 skins/old/media/js/post.js.c:553 +#, c-format msgid "%s follower" msgid_plural "%s followers" msgstr[0] "" msgstr[1] "" -#: skins/default/media/js/post.js:546 +#: skins/common/media/js/post.js:550 skins/default/media/js/post.js:549 +#: skins/old/media/js/post.js:549 msgid "<div>Following</div><div class=\"unfollow\">Unfollow</div>" msgstr "" -#: skins/default/media/js/post.js:1613 +#: skins/common/media/js/post.js:612 +msgid "undelete" +msgstr "取消" + +#: skins/common/media/js/post.js:617 +msgid "delete" +msgstr "删除" + +#: skins/common/media/js/post.js:954 +msgid "add comment" +msgstr "添加评论" + +#: skins/common/media/js/post.js:957 +msgid "save comment" +msgstr "" + +#: skins/common/media/js/post.js:984 +msgid "enter more characters" +msgstr "" + +#: skins/common/media/js/post.js:989 +#, c-format +msgid "%s characters left" +msgstr "还可写%s字符" + +#: skins/common/media/js/post.js:1060 +msgid "cancel" +msgstr "" + +#: skins/common/media/js/post.js:1103 +msgid "confirm abandon comment" +msgstr "" + +#: skins/common/media/js/post.js:1177 +msgid "delete this comment" +msgstr "删除此评论" + +#: skins/common/media/js/post.js:1381 +msgid "confirm delete comment" +msgstr "真要删除此评论吗？" + +#: skins/common/media/js/post.js:1622 skins/default/media/js/post.js:1621 +#: skins/old/media/js/post.js:1621 msgid "Please enter question title (>10 characters)" msgstr "" +#: skins/common/media/js/tag_selector.js:15 #: skins/default/media/js/tag_selector.js:15 +#: skins/old/media/js/tag_selector.js:15 msgid "Tag \"<span></span>\" matches:" msgstr "" +#: skins/common/media/js/tag_selector.js:84 #: skins/default/media/js/tag_selector.js:84 -#, perl-format +#: skins/old/media/js/tag_selector.js:84 +#, c-format msgid "and %s more, not shown..." msgstr "" -#: skins/default/media/js/user.js:129 +#: skins/common/media/js/user.js:14 +msgid "Please select at least one item" +msgstr "" + +#: skins/common/media/js/user.js:58 +msgid "Delete this notification?" +msgid_plural "Delete these notifications?" +msgstr[0] "" + +#: skins/common/media/js/user.js:125 skins/default/media/js/user.js:129 +#: skins/old/media/js/user.js:129 msgid "Please <a href=\"%(signin_url)s\">signin</a> to follow %(username)s" msgstr "" -#: skins/default/media/js/user.js:161 -#, perl-format +#: skins/common/media/js/user.js:157 skins/default/media/js/user.js:161 +#: skins/old/media/js/user.js:161 +#, c-format msgid "unfollow %s" msgstr "" -#: skins/default/media/js/user.js:164 -#, perl-format +#: skins/common/media/js/user.js:160 skins/default/media/js/user.js:164 +#: skins/old/media/js/user.js:164 +#, c-format msgid "following %s" msgstr "" -#: skins/default/media/js/user.js:170 -#, perl-format +#: skins/common/media/js/user.js:166 skins/default/media/js/user.js:170 +#: skins/old/media/js/user.js:170 +#, c-format msgid "follow %s" msgstr "" + +#: skins/common/media/js/utils.js:43 +msgid "click to close" +msgstr "点击消息框关闭" + +#: skins/common/media/js/utils.js:214 +msgid "click to edit this comment" +msgstr "" + +#: skins/common/media/js/utils.js:215 +msgid "edit" +msgstr "" + +#: skins/common/media/js/utils.js:369 +#, c-format +msgid "see questions tagged '%s'" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:30 +msgid "bold" +msgstr "粗体" + +#: skins/common/media/js/wmd/wmd.js:31 +msgid "italic" +msgstr "斜体" + +#: skins/common/media/js/wmd/wmd.js:32 +msgid "link" +msgstr "超链接" + +#: skins/common/media/js/wmd/wmd.js:33 +msgid "quote" +msgstr "引用" + +#: skins/common/media/js/wmd/wmd.js:34 +msgid "preformatted text" +msgstr "代码" + +#: skins/common/media/js/wmd/wmd.js:35 +msgid "image" +msgstr "图片" + +#: skins/common/media/js/wmd/wmd.js:36 +msgid "attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:37 +msgid "numbered list" +msgstr "数字编号列表" + +#: skins/common/media/js/wmd/wmd.js:38 +msgid "bulleted list" +msgstr "项目符号列表" + +#: skins/common/media/js/wmd/wmd.js:39 +msgid "heading" +msgstr "标题" + +#: skins/common/media/js/wmd/wmd.js:40 +msgid "horizontal bar" +msgstr "水平线" + +#: skins/common/media/js/wmd/wmd.js:41 +msgid "undo" +msgstr "撤销" + +#: skins/common/media/js/wmd/wmd.js:42 skins/common/media/js/wmd/wmd.js:1116 +msgid "redo" +msgstr "重做" + +#: skins/common/media/js/wmd/wmd.js:53 +msgid "enter image url" +msgstr "<b>输入图片地址</b></p><p>示例：<br />http://www.example.com/image.jpg \"我的截图\"" + +#: skins/common/media/js/wmd/wmd.js:54 +msgid "enter url" +msgstr "<b>输入Web地址</b></p><p>示例：<br />http://www.cnprog.com/ \"我的网站\"</p>" + +#: skins/common/media/js/wmd/wmd.js:55 +msgid "upload file attachment" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1778 +msgid "image description" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1781 +msgid "file name" +msgstr "" + +#: skins/common/media/js/wmd/wmd.js:1785 +msgid "link text" +msgstr "" diff --git a/askbot/management/commands/send_email.py b/askbot/management/commands/send_email.py new file mode 100644 index 00000000..2493c51b --- /dev/null +++ b/askbot/management/commands/send_email.py @@ -0,0 +1,24 @@ +from askbot.utils.mail import send_mail +from django.core.exceptions import ValidationError +from django.core.management.base import BaseCommand, CommandError +from django.core.validators import validate_email + +class Command(BaseCommand): + args = '<recipients email>' + help = 'Sends a test email to the specified email address' + + def handle(self, *args, **options): + + if len(args) != 1: + raise CommandError('Recipients email address required') + + try: + validate_email(args[0]) + except ValidationError: + raise CommandError('%s is not a valid email address' % (args[0])) + + send_mail( + subject_line = 'Askbot Mail Test', + body_text = 'Askbot Mail Test', + recipient_list = [args[0]], + ) diff --git a/askbot/skins/common/media/jquery-openid/jquery.openid.js b/askbot/skins/common/media/jquery-openid/jquery.openid.js index 7ba9adce..1d972b55 100644 --- a/askbot/skins/common/media/jquery-openid/jquery.openid.js +++ b/askbot/skins/common/media/jquery-openid/jquery.openid.js @@ -70,13 +70,7 @@ $.fn.authenticator = function() { ).find('button'); remove_button.click( function(){ - var message = $.i18n._( - 'Are you sure you want to remove ' + - 'your {provider} login?' - ).replace( - '{provider}', - provider_name - ); + var message = interpolate(gettext('Are you sure you want to remove your %s login?'), [provider_name]); if (confirm(message)){ $.ajax({ type: 'POST', @@ -93,10 +87,10 @@ $.fn.authenticator = function() { $('#ab-existing-login-methods').remove(); $('#ab-show-login-methods').remove(); $('h1').html( - $.i18n._("Please add one or more login methods.") + gettext("Please add one or more login methods.") ); $('#login-intro').html( - $.i18n._("You don\'t have a method to log in right now, please add one or more by clicking any of the icons below.") + gettext("You don\'t have a method to log in right now, please add one or more by clicking any of the icons below.") ); existing_login_methods = null; } @@ -138,7 +132,7 @@ $.fn.authenticator = function() { if (newpass.val() !== newpass_retyped.val()){ newpass_retyped.after( '<span class="error">' + - $.i18n._('passwords do not match') + + gettext('passwords do not match') + '</span>' ); newpass.val('').focus(); @@ -165,7 +159,7 @@ $.fn.authenticator = function() { else { enabler = $( '<p id="login-list-enabler"><a href="#">' + - $.i18n._('Show/change current login methods') + + gettext('Show/change current login methods') + '</a></p>'); setup_event_handlers( enabler, @@ -225,18 +219,15 @@ $.fn.authenticator = function() { reset_form(); var token_name = extra_token_name[provider_name] if (userIsAuthenticated){ - var heading_text = $.i18n._( - 'Please enter your {token_name}, then proceed' - ); $('#openid-heading').html( - heading_text.replace('{token_name}', token_name) + interpolate(gettext('Please enter your %s, then proceed'), [token_name]) ); - var button_text = $.i18n._('Connect your {provider_name} account to {site}'); - button_text = button_text.replace( - '{provider_name}', provider_name - ).replace( - '{site}', siteName - ); + var button_text = gettext('Connect your %(provider_name)s account to %(site)s'); + var data = { + provider_name: provider_name, + site: siteName + } + button_text = interpolate(button_text, data, true); openid_submit_button.val(button_text); } else { @@ -318,24 +309,22 @@ $.fn.authenticator = function() { if (userIsAuthenticated === true){ var password_button = $('input[name=change_password]'); var submit_action = submit_change_password; - if (existing_login_methods && existing_login_methods[provider_name]){ - var change_pw_heading = 'Change your {provider} password'; - var password_heading_text = $.i18n._(change_pw_heading); - var password_button_text = $.i18n._('Change password'); - } - else { - var create_pw_heading = 'Create a password for {provider}'; - var password_heading_text = $.i18n._(create_pw_heading); - var password_button_text = $.i18n._('Create password'); - } if (provider_name === 'local'){ var provider_cleaned_name = siteName; } else { var provider_cleaned_name = provider_name; } + if (existing_login_methods && existing_login_methods[provider_name]){ + var password_heading_text = interpolate(gettext('Change your %s password'), [provider_cleaned_name]) + var password_button_text = gettext('Change password') + } + else { + var password_heading_text = interpolate(gettext('Create a password for %s'), [provider_cleaned_name]) + var password_button_text = gettext('Create password') + } $('#password-heading').html( - password_heading_text.replace('{provider}', provider_cleaned_name) + password_heading_text ) password_button.val(password_button_text); password_action_input.val('change_password'); @@ -348,7 +337,7 @@ $.fn.authenticator = function() { var submit_action = submit_login_with_password; var create_pw_link = $('a.create-password-account') if (create_pw_link.length > 0){ - create_pw_link.html($.i18n._('Create a password-protected account')); + create_pw_link.html(gettext('Create a password-protected account')); var url = create_pw_link.attr('href'); if (url.indexOf('?') !== -1){ url = url.replace(/\?.*$/,'?login_provider=' + provider_name); diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 0c01ab0f..6202347e 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -25,11 +25,12 @@ var lanai = }; function appendLoader(element) { + loading = gettext('loading...') element.append('<img class="ajax-loader" ' + 'src="' + mediaUrl("media/images/indicator.gif") + '" title="' + - $.i18n._('loading...') + + loading + '" alt="' + - $.i18n._('loading...') + + loading + '" />'); } @@ -121,20 +122,21 @@ var CPValidator = function(){ }; }, getQuestionFormMessages: function(){ + //todo: here use pluralization function instead of replace return { tags: { - required: " " + $.i18n._('tags cannot be empty'), + required: " " + gettext('tags cannot be empty'), maxlength: askbot['messages']['tagLimits'], limit_tag_count: askbot['messages']['maxTagsPerPost'], limit_tag_length: askbot['messages']['maxTagLength'] }, text: { - required: " " + $.i18n._('content cannot be empty'), - minlength: $.i18n._('content minchars').replace('{0}', 10) + required: " " + gettext('content cannot be empty'), + minlength: gettext('content minchars').replace('{0}', 10) }, title: { - required: " " + $.i18n._('please enter title'), - minlength: $.i18n._('title minchars').replace('{0}', 10) + required: " " + gettext('please enter title'), + minlength: gettext('title minchars').replace('{0}', 10) } }; } @@ -277,24 +279,24 @@ var Vote = function(){ var questionSubscribeUpdates = 'question-subscribe-updates'; var questionSubscribeSidebar= 'question-subscribe-sidebar'; - var acceptAnonymousMessage = $.i18n._('insufficient privilege'); - var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best'); + var acceptAnonymousMessage = gettext('insufficient privilege'); + var acceptOwnAnswerMessage = gettext('cannot pick own answer as best'); var pleaseLogin = " <a href='" + askbot['urls']['user_signin'] + "?next=" + askbot['urls']['question_url_template'] + "'>" - + $.i18n._('please login') + "</a>"; + + gettext('please login') + "</a>"; - var favoriteAnonymousMessage = $.i18n._('anonymous users cannot follow questions') + pleaseLogin; - var subscribeAnonymousMessage = $.i18n._('anonymous users cannot subscribe to questions') + pleaseLogin; - var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin; + var favoriteAnonymousMessage = gettext('anonymous users cannot follow questions') + pleaseLogin; + var subscribeAnonymousMessage = gettext('anonymous users cannot subscribe to questions') + pleaseLogin; + var voteAnonymousMessage = gettext('anonymous users cannot vote') + pleaseLogin; //there were a couple of more messages... - var offensiveConfirmation = $.i18n._('please confirm offensive'); - var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts') + pleaseLogin; - var removeConfirmation = $.i18n._('confirm delete'); - var removeAnonymousMessage = $.i18n._('anonymous users cannot delete/undelete') + pleaseLogin; - var recoveredMessage = $.i18n._('post recovered'); - var deletedMessage = $.i18n._('post deleted'); + var offensiveConfirmation = gettext('please confirm offensive'); + var offensiveAnonymousMessage = gettext('anonymous users cannot flag offensive posts') + pleaseLogin; + var removeConfirmation = gettext('confirm delete'); + var removeAnonymousMessage = gettext('anonymous users cannot delete/undelete') + pleaseLogin; + var recoveredMessage = gettext('post recovered'); + var deletedMessage = gettext('post deleted'); var VoteType = { acceptAnswer : 0, @@ -373,13 +375,24 @@ var Vote = function(){ return $(removeAnswerLinks); }; - var setVoteImage = function(voteType, undo, elem){ - elem.siblings('.post-vote').removeClass('on'); - if (undo){ - elem.removeClass('on'); - return; + var setVoteImage = function(voteType, undo, object){ + var flag = undo ? false : true; + if (object.hasClass("on")) { + object.removeClass("on"); + }else{ + object.addClass("on"); + } + + if(undo){ + if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){ + $(getQuestionVoteUpButton()).removeClass("on"); + $(getQuestionVoteDownButton()).removeClass("on"); + } + else{ + $(getAnswerVoteUpButton(postId)).removeClass("on"); + $(getAnswerVoteDownButton(postId)).removeClass("on"); + } } - elem.addClass('on'); }; var setVoteNumber = function(object, number){ @@ -389,10 +402,12 @@ var Vote = function(){ var bindEvents = function(){ // accept answers - var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']'; - $(acceptedButtons).unbind('click').click(function(event){ - Vote.accept($(event.target)); - }); + if(questionAuthorId == currentUserId){ + var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']'; + $(acceptedButtons).unbind('click').click(function(event){ + Vote.accept($(event.target)); + }); + } // set favorite question var favoriteButton = getFavoriteButton(); favoriteButton.unbind('click').click(function(event){ @@ -555,7 +570,6 @@ var Vote = function(){ } else { if (data.status == '1'){ - //cancel vote setVoteImage(voteType, true, object); } else { @@ -598,12 +612,12 @@ var Vote = function(){ if (data.success == "1"){ if (removeActionType == 'delete'){ postNode.addClass('deleted'); - postRemoveLink.innerHTML = $.i18n._('undelete'); + postRemoveLink.innerHTML = gettext('undelete'); showMessage(object, deletedMessage); } else if (removeActionType == 'undelete') { postNode.removeClass('deleted'); - postRemoveLink.innerHTML = $.i18n._('delete'); + postRemoveLink.innerHTML = gettext('delete'); showMessage(object, recoveredMessage); } } @@ -828,7 +842,7 @@ var questionRetagger = function(){ setupInputEventHandlers(tagInput); //button = $('<input type="submit" />'); - //button.val($.i18n._('save tags')); + //button.val(gettext('save tags')); //div.append(button); //setupButtonEventHandlers(button); div.validate({//copy-paste from utils.js @@ -842,7 +856,7 @@ var questionRetagger = function(){ }, messages: { tags: { - required: $.i18n._('tags cannot be empty'), + required: gettext('tags cannot be empty'), maxlength: askbot['messages']['tagLimits'], limit_tag_count: askbot['messages']['maxTagsPerPost'], limit_tag_length: askbot['messages']['maxTagLength'] @@ -940,10 +954,10 @@ EditCommentForm.prototype.attachTo = function(comment, mode){ comment.getElement().hide(); this._comment_widget.hideButton(); if (this._type == 'add'){ - this._submit_btn.html($.i18n._('add comment')); + this._submit_btn.html(gettext('add comment')); } else { - this._submit_btn.html($.i18n._('save comment')); + this._submit_btn.html(gettext('save comment')); } this.getElement().show(); this.focus(); @@ -965,19 +979,22 @@ EditCommentForm.prototype.getCounterUpdater = function(){ length2 = Math.round(0.9*maxCommentLength); } + //todo: + //1) use class instead of color - move color def to css + //2) use pluralization and interpolation instead of string replacement var color = 'maroon'; if (length === 0){ - var feedback = $.i18n._('title minchars').replace('{0}', 10); + var feedback = gettext('title minchars').replace('{0}', 10); } else if (length < 10){ - var feedback = $.i18n._('enter more characters').replace('{0}', 10 - length); + var feedback = gettext('enter more characters').replace('{0}', 10 - length); } else { - color = length > length2 ? "#f00" : length > length1 ? "#f60" : "#999"; - var feedback = $.i18n._('{0} characters left') - .replace('{0}', maxCommentLength - length); + color = length > length2 ? "#f00" : length > length1 ? "#f60" : "#999" + chars = maxCommentLength - length + var feedback = interpolate(gettext('%s characters left'), [chars]) } - counter.html(feedback).css('color', color); + counter.html(feedback).css('color', color) }; return handler; }; @@ -1046,7 +1063,7 @@ EditCommentForm.prototype.createDom = function(){ this._submit_btn = $('<button class="submit small"></button>'); div.append(this._submit_btn); this._cancel_btn = $('<button class="submit small"></button>'); - this._cancel_btn.html($.i18n._('cancel')); + this._cancel_btn.html(gettext('cancel')); div.append(this._cancel_btn); setupButtonEventHandlers(this._submit_btn, this.getSaveHandler()); @@ -1089,7 +1106,7 @@ EditCommentForm.prototype.reset = function(){ EditCommentForm.prototype.confirmAbandon = function(){ this.focus(true); this._textarea.addClass('highlight'); - var answer = confirm($.i18n._('confirm abandon comment')); + var answer = confirm(gettext('confirm abandon comment')); this._textarea.removeClass('highlight'); return answer; }; @@ -1163,7 +1180,7 @@ var Comment = function(widget, data){ this._data = data || {}; this._blank = true;//set to false by setContent this._element = null; - this._delete_prompt = $.i18n._('delete this comment'); + this._delete_prompt = gettext('delete this comment'); if (data && data['is_deletable']){ this._deletable = data['is_deletable']; } @@ -1367,7 +1384,7 @@ Comment.prototype.getDeleteHandler = function(){ var comment = this; var del_icon = this._delete_icon; return function(){ - if (confirm($.i18n._('confirm delete comment'))){ + if (confirm(gettext('confirm delete comment'))){ comment.getElement().hide(); $.ajax({ type: 'POST', diff --git a/askbot/skins/common/media/js/user.js b/askbot/skins/common/media/js/user.js index 438a3273..d80adad6 100644 --- a/askbot/skins/common/media/js/user.js +++ b/askbot/skins/common/media/js/user.js @@ -11,7 +11,7 @@ $(document).ready(function(){ }); if (id_list.length === 0){ - alert($.i18n._('Please select at least one item')); + alert(gettext('Please select at least one item')); } return {id_list: id_list, elements: elements}; @@ -55,12 +55,8 @@ $(document).ready(function(){ return; } if (action_type == 'delete'){ - if (data['id_list'].length === 1){ - var msg = $.i18n._('Delete this notification?') - } - else { - var msg = $.i18n._('Delete these notifications?') - } + msg = ngettext('Delete this notification?', + 'Delete these notifications?', data['id_list'].length); if (confirm(msg) === false){ return; } diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index 2b2579ab..0afd03a7 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -40,7 +40,7 @@ var getUniqueWords = function(value){ var showMessage = function(element, msg, where) { var div = $('<div class="vote-notification"><h3>' + msg + '</h3>(' + - $.i18n._('click to close') + ')</div>'); + gettext('click to close') + ')</div>'); div.click(function(event) { $(".vote-notification").fadeOut("fast", function() { $(this).remove(); }); @@ -211,8 +211,8 @@ EditLink.prototype.createDom = function(){ EditLink.prototype.decorate = function(element){ this._element = element; - this._element.attr('title', $.i18n._('click to edit this comment')); - this._element.html($.i18n._('edit')); + this._element.attr('title', gettext('click to edit this comment')); + this._element.html(gettext('edit')); this.setHandlerInternal(); }; @@ -366,12 +366,7 @@ Tag.prototype.createDom = function(){ this._inner_element.attr('rel', 'tag'); if (this._title === null){ this.setTitle( - $.i18n._( - "see questions tagged '{tag}'" - ).replace( - '{tag}', - this.getName() - ) + interpolate(gettext("see questions tagged '%s'"), [this.getName()]) ); } this._inner_element.attr('title', this._title); diff --git a/askbot/skins/common/media/js/wmd/wmd.js b/askbot/skins/common/media/js/wmd/wmd.js index f5354fac..1d524361 100644 --- a/askbot/skins/common/media/js/wmd/wmd.js +++ b/askbot/skins/common/media/js/wmd/wmd.js @@ -27,19 +27,19 @@ Attacklab.wmdBase = function(){ global.isOpera = /opera/.test(nav.userAgent.toLowerCase()); global.isKonqueror = /konqueror/.test(nav.userAgent.toLowerCase()); - var toolbar_strong_label = $.i18n._('bold') + " <strong> Ctrl-B"; - var toolbar_emphasis_label = $.i18n._('italic') + " <em> Ctrl-I"; - var toolbar_hyperlink_label = $.i18n._('link') + " <a> Ctrl-L"; - var toolbar_blockquote_label = $.i18n._('quote') + " <blockquote> Ctrl-."; - var toolbar_code_label = $.i18n._('preformatted text') + " <pre><code> Ctrl-K"; - var toolbar_image_label = $.i18n._('image') + " <img> Ctrl-G"; - var toolbar_attachment_label = $.i18n._('attachment') + " Ctrl-F"; - var toolbar_numbered_label = $.i18n._('numbered list') + " <ol> Ctrl-O"; - var toolbar_bulleted_label = $.i18n._('bulleted list') + " <ul> Ctrl-U"; - var toolbar_heading_label = $.i18n._('heading') + " <h1>/<h2> Ctrl-H"; - var toolbar_horizontal_label = $.i18n._('horizontal bar') + " <hr> Ctrl-R"; - var toolbar_undo_label = $.i18n._('undo') + " Ctrl-Z"; - var toolbar_redo_label = $.i18n._('redo') + " Ctrl-Y"; + var toolbar_strong_label = gettext('bold') + " <strong> Ctrl-B"; + var toolbar_emphasis_label = gettext('italic') + " <em> Ctrl-I"; + var toolbar_hyperlink_label = gettext('link') + " <a> Ctrl-L"; + var toolbar_blockquote_label = gettext('quote') + " <blockquote> Ctrl-."; + var toolbar_code_label = gettext('preformatted text') + " <pre><code> Ctrl-K"; + var toolbar_image_label = gettext('image') + " <img> Ctrl-G"; + var toolbar_attachment_label = gettext('attachment') + " Ctrl-F"; + var toolbar_numbered_label = gettext('numbered list') + " <ol> Ctrl-O"; + var toolbar_bulleted_label = gettext('bulleted list') + " <ul> Ctrl-U"; + var toolbar_heading_label = gettext('heading') + " <h1>/<h2> Ctrl-H"; + var toolbar_horizontal_label = gettext('horizontal bar') + " <hr> Ctrl-R"; + var toolbar_undo_label = gettext('undo') + " Ctrl-Z"; + var toolbar_redo_label = gettext('redo') + " Ctrl-Y"; // ------------------------------------------------------------------- // YOUR CHANGES GO HERE @@ -50,9 +50,9 @@ Attacklab.wmdBase = function(){ // The text that appears on the upper part of the dialog box when // entering links. - var imageDialogText = "<p style='margin-top: 0px'>" + $.i18n._('enter image url') + '</p>'; - var linkDialogText = "<p style='margin-top: 0px'>" + $.i18n._('enter url') + '</p>'; - var fileDialogText = "<p>" + $.i18n._('upload file attachment') + '</p>'; + var imageDialogText = "<p style='margin-top: 0px'>" + gettext('enter image url') + '</p>'; + var linkDialogText = "<p style='margin-top: 0px'>" + gettext('enter url') + '</p>'; + var fileDialogText = "<p>" + gettext('upload file attachment') + '</p>'; // The default text that appears in the dialog input box when entering // links. var imageDefaultText = "http://"; @@ -1113,7 +1113,7 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ } else { // mac and other non-Windows platforms - redoButton.title = $.i18n._('redo') + " - Ctrl+Shift+Z"; + redoButton.title = gettext('redo') + " - Ctrl+Shift+Z"; } redoButton.XShift = "-240px"; redoButton.execute = function(manager){ @@ -1775,14 +1775,14 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){ if (!chunk.selection) { if (itemType == 'image') { - chunk.selection = $.i18n._("image description"); + chunk.selection = gettext("image description"); } else if (itemType == 'file'){ - chunk.selection = localUploadFileName || $.i18n._("file name"); + chunk.selection = localUploadFileName || gettext("file name"); localUploadFileName = null; } else { - chunk.selection = $.i18n._("link text"); + chunk.selection = gettext("link text"); } } } diff --git a/askbot/skins/common/templates/question/answer_vote_buttons.html b/askbot/skins/common/templates/question/answer_vote_buttons.html index e3072ae4..0ff57e4b 100644 --- a/askbot/skins/common/templates/question/answer_vote_buttons.html +++ b/askbot/skins/common/templates/question/answer_vote_buttons.html @@ -3,15 +3,15 @@ visitor_vote = user_answer_votes[answer.id] ) }} -{% if request.user == question.author or request.user.is_authenticated() and (request.user.is_moderator() or request.user.is_administrator()) %} +{% if request.user == question.author or (request.user.is_authenticated() and (request.user.is_moderator() or request.user.is_administrator())) %} <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" {% if answer.accepted %} src="{{'/images/vote-accepted-on.png'|media}}" {% else %} src="{{'/images/vote-accepted.png'|media}}" {% endif %} - alt="{% trans %}mark this answer as favorite (click again to undo){% endtrans %}" - title="{% trans %}mark this answer as favorite (click again to undo){% endtrans %}" /> + alt="{% trans %}mark this answer as correct (click again to undo){% endtrans %}" + title="{% trans %}mark this answer as correct (click again to undo){% endtrans %}" /> {% else %} {% if answer.accepted %} <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" diff --git a/askbot/skins/common/templates/widgets/search_bar.html b/askbot/skins/common/templates/widgets/search_bar.html index 5efe3860..d5a7859b 100644 --- a/askbot/skins/common/templates/widgets/search_bar.html +++ b/askbot/skins/common/templates/widgets/search_bar.html @@ -21,8 +21,12 @@ {% endif %} {# class was searchInput #} <input - {% if query %} + {% if query and request.user.is_authenticated() %} + class="searchInputCancelableAuth" + {% elif query %} class="searchInputCancelable" + {% elif request.user.is_authenticated() %} + class="searchInputAuth" {% else %} class="searchInput" {% endif %} diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 46b3ac00..cacc8782 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -1,2654 +1,2483 @@ @import url(jquery.autocomplete.css); -@import "lib_style.less"; /* Library of predifined less functions styles */ - +/* General Predifined classes, read more in lesscss.org */ +/* Variables for Colors*/ +/* Variables for fonts*/ +/* "Trebuchet MS", sans-serif;*/ +/* Receive exactly positions for background Sprite */ +/* CSS3 Elements */ +/* Library of predifined less functions styles */ /* ----- General HTML Styles----- */ - body { - background: #FFF; - font-size: 14px; - line-height: 150%; - margin: 0; - padding: 0; - color: #000; - font-family:@body-font; + background: #FFF; + font-size: 14px; + line-height: 150%; + margin: 0; + padding: 0; + color: #000; + font-family: Arial; } - div { - margin: 0 auto; - padding: 0; -} - -h1, h2, h3, h4, h5, h6, ul, li, dl, dt, dd, form, img, p { - margin: 0; - padding: 0; - border: none; + margin: 0 auto; + padding: 0; +} +h1, +h2, +h3, +h4, +h5, +h6, +ul, +li, +dl, +dt, +dd, +form, +img, +p { + margin: 0; + padding: 0; + border: none; } - label { - vertical-align: middle; + vertical-align: middle; } - hr { - border: none; - border-top: 1px dashed #ccccce; + border: none; + border-top: 1px dashed #ccccce; } - input, select { - vertical-align: middle; - font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif; - margin-left:0px; + vertical-align: middle; + font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif; + margin-left: 0px; } - p { - font-size: 14px; - line-height: 140%; - margin-bottom: 6px; + font-size: 14px; + line-height: 140%; + margin-bottom: 6px; } - a { - color:@link; - text-decoration: none; - cursor: pointer; + color: #1b79bd; + text-decoration: none; + cursor: pointer; } - h2 { - font-size: 21px; - padding: 3px 0 3px 5px; + font-size: 21px; + padding: 3px 0 3px 5px; } - h3 { - font-size: 19px; - padding: 3px 0 3px 5px; + font-size: 19px; + padding: 3px 0 3px 5px; } - ul { - list-style: disc; - margin-left: 20px; - padding-left: 0px; - margin-bottom: 1em; + list-style: disc; + margin-left: 20px; + padding-left: 0px; + margin-bottom: 1em; } - ol { - list-style: decimal; - margin-left: 30px; - margin-bottom: 1em; - padding-left: 0px; + list-style: decimal; + margin-left: 30px; + margin-bottom: 1em; + padding-left: 0px; } - td ul { - vertical-align: middle; + vertical-align: middle; } - li input { - margin: 3px 3px 4px 3px; + margin: 3px 3px 4px 3px; } - pre { - font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; - font-size: 100%; - margin-bottom: 10px; - /*overflow: auto;*/ - background-color: #F5F5F5; - padding-left: 5px; - padding-top: 5px; - /*width: 671px;*/ - padding-bottom: 20px ! ie7; -} + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; + margin-bottom: 10px; + /*overflow: auto;*/ -code { - font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; - font-size: 100%; + background-color: #F5F5F5; + padding-left: 5px; + padding-top: 5px; + /*width: 671px;*/ + padding-bottom: 20px ! ie7; +} +code { + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; } - blockquote { - margin-bottom: 10px; - margin-right: 15px; - padding: 10px 0px 1px 10px; - background-color: #F5F5F5; + margin-bottom: 10px; + margin-right: 15px; + padding: 10px 0px 1px 10px; + background-color: #F5F5F5; } - /* http://pathfindersoftware.com/2007/09/developers-note-2/ */ -* html .clearfix, -* html .paginator { - height: 1; - overflow: visible; -} -+ html .clearfix, -+ html .paginator { - min-height: 1%; -} -.clearfix:after, -.paginator:after { - clear: both; - content:"."; - display:block; - height: 0; - visibility: hidden; +* html .clearfix, * html .paginator { + height: 1; + overflow: visible; +} ++ html .clearfix, + html .paginator { + min-height: 1%; +} +.clearfix:after, .paginator:after { + clear: both; + content: "."; + display: block; + height: 0; + visibility: hidden; } - .badges a { - color: #763333; - text-decoration: underline; + color: #763333; + text-decoration: underline; } - a:hover { - text-decoration: underline; + text-decoration: underline; } - .badge-context-toggle.active { - cursor: pointer; - text-decoration: underline; + cursor: pointer; + text-decoration: underline; } - h1 { - font-size: 24px; - padding: 10px 0 5px 0px; + font-size: 24px; + padding: 10px 0 5px 0px; } - /* ----- Custom positions ----- */ - -.left{float:left} -.right{float:right} -.clean{clear:both} -.center{ - margin: 0 auto; - padding: 0; +.left { + float: left; +} +.right { + float: right; +} +.clean { + clear: both; +} +.center { + margin: 0 auto; + padding: 0; } - - /* ----- Notify message bar , check blocks/system_messages.html ----- */ - .notify { - position: fixed; - top: 0px; - left: 0px; - width: 100%; - z-index: 100; - padding: 0; - text-align: center; - background-color: #f5dd69; - border-top:#fff 1px solid; - font-family:@main-font; - - p { - margin-top: 6px; - margin-bottom: 6px; - font-size: 16px; - color:#424242 - } + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 0; + text-align: center; + background-color: #f5dd69; + border-top: #fff 1px solid; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.notify p { + margin-top: 6px; + margin-bottom: 6px; + font-size: 16px; + color: #424242; } - #closeNotify { - position: absolute; - right: 5px; - top: 7px; - color: #735005; - text-decoration: none; - line-height: 18px; - .sprites(-6px,-5px); - cursor: pointer; - width:20px; - height:20px; + position: absolute; + right: 5px; + top: 7px; + color: #735005; + text-decoration: none; + line-height: 18px; + background: -6px -5px url(../images/sprites.png) no-repeat; + cursor: pointer; + width: 20px; + height: 20px; } - #closeNotify:hover { - .sprites(-26px,-5px); + background: -26px -5px url(../images/sprites.png) no-repeat; } - /* ----- Header, check blocks/header.html ----- */ - #header { - margin-top: 0px; - background: @header-color; - font-family:@main-font; -} - -.content-wrapper {/* wrapper positioning class */ - width: 960px; - margin: auto; - position:relative; -} - -#logo img{ - padding: 5px 0px 5px 0px; - height: 75px; - width: auto; -} - -#userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ - height: 20px; - position:absolute; - bottom: 0; - right:0px; - padding-bottom:5px; - - a { - height: 35px; - text-align: right; - margin-left: 20px; - text-decoration: underline; - color:#d0e296; - font-size:16px; - } - - a:first-child { - margin-left: 0; - } - - a#ab-responses { - margin-left: 3px; - } - - .user-info,.user-micro-info{ - color:#b5b593; - } - - a img { - vertical-align:middle; - margin-bottom:2px; - } - - .user-info a { - margin: 0; - text-decoration: none; - } -} - -#metaNav {/* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */ - float:right; - - a { - color: #e2e2ae; - padding: 0px 0px 0px 35px; - height: 25px; - line-height: 30px; - margin:5px 0px 0px 10px; - font-size: 18px; - font-weight: 100; - text-decoration: none; - display: block; - float: left; - } - - a:hover { - text-decoration: underline; - } - - a.on { - font-weight:bold; - color: #FFF; - text-decoration: none; - } - - a.special { - font-size: 18px; - color: #B02B2C; - font-weight: bold; - text-decoration: none; - } - - a.special:hover { - text-decoration: underline; - } - - #navTags{ - .sprites(-50px,-5px) - } - - #navUsers{ - .sprites(-125px,-5px) - } - - #navBadges{ - .sprites(-210px,-5px) - } -} - -#secondaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */ - height:55px; - background:#e9e9e1; - border-bottom:#d3d3c2 1px solid; - border-top:#fcfcfc 1px solid; - margin-bottom:10px; - font-family:@main-font; - - #homeButton{ - border-right:#afaf9e 1px solid; - .sprites(-6px,-36px); - height:55px; - width:43px; - display:block; - float:left; - } - - #homeButton:hover{ - .sprites(-6px-45,-36px); - } - - #scopeWrapper{ - width:688px; - float:left; - - a{ - display:block; - float:left; - } - - .scope-selector{ - font-size:21px; - color:#5a5a4b; - height:55px; - line-height:55px; - margin-left:24px - } - .on{ - background:url(../images/scopearrow.png) no-repeat center bottom; - } - - .ask-message{ - font-size:24px; - } - } + margin-top: 0px; + background: #16160f; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.content-wrapper { + /* wrapper positioning class */ + + width: 960px; + margin: auto; + position: relative; +} +#logo img { + padding: 5px 0px 5px 0px; + height: 75px; + width: auto; +} +#userToolsNav { + /* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ + + height: 20px; + position: absolute; + bottom: 0; + right: 0px; + padding-bottom: 5px; +} +#userToolsNav a { + height: 35px; + text-align: right; + margin-left: 20px; + text-decoration: underline; + color: #d0e296; + font-size: 16px; +} +#userToolsNav a:first-child { + margin-left: 0; +} +#userToolsNav a#ab-responses { + margin-left: 3px; +} +#userToolsNav .user-info, #userToolsNav .user-micro-info { + color: #b5b593; +} +#userToolsNav a img { + vertical-align: middle; + margin-bottom: 2px; +} +#userToolsNav .user-info a { + margin: 0; + text-decoration: none; +} +#metaNav { + /* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */ + + float: right; +} +#metaNav a { + color: #e2e2ae; + padding: 0px 0px 0px 35px; + height: 25px; + line-height: 30px; + margin: 5px 0px 0px 10px; + font-size: 18px; + font-weight: 100; + text-decoration: none; + display: block; + float: left; +} +#metaNav a:hover { + text-decoration: underline; +} +#metaNav a.on { + font-weight: bold; + color: #FFF; + text-decoration: none; +} +#metaNav a.special { + font-size: 18px; + color: #B02B2C; + font-weight: bold; + text-decoration: none; +} +#metaNav a.special:hover { + text-decoration: underline; +} +#metaNav #navTags { + background: -50px -5px url(../images/sprites.png) no-repeat; +} +#metaNav #navUsers { + background: -125px -5px url(../images/sprites.png) no-repeat; +} +#metaNav #navBadges { + background: -210px -5px url(../images/sprites.png) no-repeat; +} +#secondaryHeader { + /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */ + + height: 55px; + background: #e9e9e1; + border-bottom: #d3d3c2 1px solid; + border-top: #fcfcfc 1px solid; + margin-bottom: 10px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +#secondaryHeader #homeButton { + border-right: #afaf9e 1px solid; + background: -6px -36px url(../images/sprites.png) no-repeat; + height: 55px; + width: 43px; + display: block; + float: left; +} +#secondaryHeader #homeButton:hover { + background: -51px -36px url(../images/sprites.png) no-repeat; +} +#secondaryHeader #scopeWrapper { + width: 688px; + float: left; +} +#secondaryHeader #scopeWrapper a { + display: block; + float: left; +} +#secondaryHeader #scopeWrapper .scope-selector { + font-size: 21px; + color: #5a5a4b; + height: 55px; + line-height: 55px; + margin-left: 24px; +} +#secondaryHeader #scopeWrapper .on { + background: url(../images/scopearrow.png) no-repeat center bottom; +} +#secondaryHeader #scopeWrapper .ask-message { + font-size: 24px; +} +#searchBar { + /* Main search form , check widgets/search_bar.html */ + + display: inline-block; + background-color: #fff; + width: 412px; + border: 1px solid #c9c9b5; + float: right; + height: 42px; + margin: 6px 0px 0px 15px; +} +#searchBar .searchInput, +#searchBar .searchInputCancelable, +#searchBar .searchInputAuth, +#searchBar .searchInputCancelableAuth { + font-size: 30px; + height: 40px; + font-weight: 300; + background: #FFF; + border: 0px; + color: #484848; + padding-left: 10px; + font-family: Arial; + vertical-align: middle; +} +#searchBar .searchInput, #searchBar .searchInputCancelable { + width: 352px; +} +#searchBar .searchInputCancelable { + width: 317px; +} +#searchBar .searchInputAuth { + width: 340px; +} +#searchBar .searchInputCancelableAuth { + width: 310px; + /*FIXME byron */ + +} +#searchBar .logoutsearch { + width: 337px; +} +#searchBar .searchBtn { + font-size: 10px; + color: #666; + background-color: #eee; + height: 42px; + border: #FFF 1px solid; + line-height: 22px; + text-align: center; + float: right; + margin: 0px; + width: 48px; + background: -98px -36px url(../images/sprites.png) no-repeat; + cursor: pointer; +} +#searchBar .searchBtn:hover { + background: -146px -36px url(../images/sprites.png) no-repeat; +} +#searchBar .cancelSearchBtn { + font-size: 30px; + color: #ce8888; + background: #fff; + height: 42px; + border: 0px; + border-left: #deded0 1px solid; + text-align: center; + width: 35px; + cursor: pointer; +} +#searchBar .cancelSearchBtn:hover { + color: #d84040; +} +#askButton { + /* check blocks/secondary_header.html and widgets/ask_button.html*/ + + background: url(../images/bigbutton.png) repeat-x bottom; + line-height: 44px; + text-align: center; + width: 200px; + height: 42px; + font-size: 23px; + color: #4a757f; + margin-top: 7px; + float: right; + text-transform: uppercase; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; +} +#askButton:hover { + text-decoration: none; + background: url(../images/bigbutton.png) repeat-x top; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } - -#searchBar { /* Main search form , check widgets/search_bar.html */ - display:inline-block; - background-color: #fff; - width:412px; - border: 1px solid #c9c9b5; - float:right; - height:42px; - margin:6px 0px 0px 15px; - - .searchInput, .searchInputCancelable { - font-size: 30px; - height: 40px; - font-weight:300; - background:#FFF; - border:0px; - color:#484848; - padding-left:10px; - font-family:@body-font; - vertical-align: middle; - } - - .searchInput, .searchInputCancelable { - width: 352px; - } - - .searchInputCancelable { - width: 317px; - } - .logoutsearch { - width: 337px; - } - - .searchBtn { - font-size: 10px; - color: #666; - background-color: #eee; - height: 42px; - border:#FFF 1px solid; - line-height: 22px; - text-align: center; - float:right; - margin: 0px; - width:48px; - .sprites(-98px,-36px); - cursor:pointer; - } - - .searchBtn:hover { - .sprites(-98px-48,-36px); - } - - .cancelSearchBtn { - font-size: 30px; - color: #ce8888; - background:#fff; - height: 42px; - border:0px; - border-left:#deded0 1px solid; - text-align: center; - width: 35px; - cursor:pointer; - } - - .cancelSearchBtn:hover { - color: #d84040; - } -} - -#askButton{ /* check blocks/secondary_header.html and widgets/ask_button.html*/ - background: url(../images/bigbutton.png) repeat-x bottom; - line-height:44px; - text-align:center; - width:200px; - height:42px; - font-size:23px; - color:@button-label; - margin-top:7px; - float:right; - text-transform:uppercase; - .rounded-corners(5px); - .box-shadow(1px, 1px, 2px, #636363) -} - -#askButton:hover{ - text-decoration:none; - background: url(../images/bigbutton.png) repeat-x top; - .text-shadow(0px, 1px, 0px, #c6d9dd) -} - /* ----- Content layout, check two_column_body.html or one_column_body.html ----- */ - #ContentLeft { - width: 730px; - float: left; - position: relative; - padding-bottom:10px; + width: 730px; + float: left; + position: relative; + padding-bottom: 10px; } - #ContentRight { - width: 200px; - float: right; - padding: 0 0px 10px 0px; + width: 200px; + float: right; + padding: 0 0px 10px 0px; } - #ContentFull { - float: left; - width: 960px; + float: left; + width: 960px; } - /* ----- Sidebar Widgets Box, check main_page/sidebar.html or question/sidebar.html ----- */ - .box { - background: #fff; - padding: 4px 0px 10px 0px; - width:200px; - - p { - margin-bottom: 4px; - } - - p.info-box-follow-up-links { - text-align: right; - margin: 0; - } - - h2 { - padding-left: 0; - background:#eceeeb; - height:30px; - line-height:30px; - text-align:right; - font-size:18px !important; - font-weight:normal; - color:#656565; - padding-right:10px; - margin-bottom:10px; - font-family:@main-font; - } - h3{ - color:#4a757f; - font-size:18px; - text-align:left; - font-weight:normal; - font-family:@main-font; - } - .contributorback{ - background: #eceeeb url(../images/contributorsback.png) no-repeat center left; - } - - label { - color: @info-text; - font-size:15px; - display: block; - float: right; - width: 177px; - font-family:@main-font; - } - - ul { - margin-left: 22px; - } - - li { - list-style-type: disc; - font-size: 13px; - line-height: 20px; - margin-bottom: 10px; - color:@info-text; - } - ul.tags { - list-style: none; - margin: 0; - padding: 0; - line-height: 170%; - display: block; - } - #displayTagFilterControl p label{ - color:@info-text; - font-size:15px; - } - - .inputs{ - #interestingTagInput, #ignoredTagInput{ - width:158px; - border:#c9c9b5 1px solid; - height:25px; - } - #interestingTagAdd, #ignoredTagAdd{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-weight:bold; - font-size:12px; - width:30px; - height:27px; - margin-top:-2px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); - - - } - #interestingTagAdd:hover, #ignoredTagAdd:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; - } - } - - img.gravatar { - margin:1px; - } - -/* widgets for question template */ - - a.followed, a.follow{ - background: url(../images/medium-button.png) top repeat-x; - height:34px; - line-height:34px; - text-align:center; - border:0; - font-family:@main-font; - color:@button-label; - font-weight:normal; - font-size:21px; - margin-top:3px; - display:block; - width:120px; - text-decoration:none; - .rounded-corners(4px); - .box-shadow(1px, 1px, 2px, #636363); - .center; - } - - a.followed:hover, a.follow:hover{ - text-decoration:none; - background: url(../images/medium-button.png) bottom repeat-x; - .text-shadow(0px, 1px, 0px, #c6d9dd); - } - - a.followed div.unfollow{ - display:none; - } - - a.followed:hover div{ - display:none; - } - a.followed:hover div.unfollow{ - display:inline; - color:#a05736; - } - - .favorite-number { - padding: 5px 0 0 5px; - font-size: 100%; - font-family: Arial; - font-weight: bold; - color: #777; - text-align:center; - } -} - -.statsWidget p{ - color:@info-text; - font-size:16px; - border-bottom:#cccccc 1px solid; - font-size:13px; - - strong{ - float:right; - padding-right:10px; - } + background: #fff; + padding: 4px 0px 10px 0px; + width: 200px; + /* widgets for question template */ + +} +.box p { + margin-bottom: 4px; +} +.box p.info-box-follow-up-links { + text-align: right; + margin: 0; +} +.box h2 { + padding-left: 0; + background: #eceeeb; + height: 30px; + line-height: 30px; + text-align: right; + font-size: 18px !important; + font-weight: normal; + color: #656565; + padding-right: 10px; + margin-bottom: 10px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.box h3 { + color: #4a757f; + font-size: 18px; + text-align: left; + font-weight: normal; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.box .contributorback { + background: #eceeeb url(../images/contributorsback.png) no-repeat center left; +} +.box label { + color: #707070; + font-size: 15px; + display: block; + float: right; + width: 177px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.box ul { + margin-left: 22px; +} +.box li { + list-style-type: disc; + font-size: 13px; + line-height: 20px; + margin-bottom: 10px; + color: #707070; +} +.box ul.tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; +} +.box #displayTagFilterControl p label { + color: #707070; + font-size: 15px; +} +.box .inputs #interestingTagInput, .box .inputs #ignoredTagInput { + width: 158px; + border: #c9c9b5 1px solid; + height: 25px; +} +.box .inputs #interestingTagAdd, .box .inputs #ignoredTagAdd { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 12px; + width: 30px; + height: 27px; + margin-top: -2px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; +} +.box .inputs #interestingTagAdd:hover, .box .inputs #ignoredTagAdd:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; +} +.box img.gravatar { + margin: 1px; +} +.box a.followed, .box a.follow { + background: url(../images/medium-button.png) top repeat-x; + height: 34px; + line-height: 34px; + text-align: center; + border: 0; + font-family: 'Yanone Kaffeesatz', sans-serif; + color: #4a757f; + font-weight: normal; + font-size: 21px; + margin-top: 3px; + display: block; + width: 120px; + text-decoration: none; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + margin: 0 auto; + padding: 0; +} +.box a.followed:hover, .box a.follow:hover { + text-decoration: none; + background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; +} +.box a.followed div.unfollow { + display: none; +} +.box a.followed:hover div { + display: none; +} +.box a.followed:hover div.unfollow { + display: inline; + color: #a05736; +} +.box .favorite-number { + padding: 5px 0 0 5px; + font-size: 100%; + font-family: Arial; + font-weight: bold; + color: #777; + text-align: center; +} +.statsWidget p { + color: #707070; + font-size: 16px; + border-bottom: #cccccc 1px solid; + font-size: 13px; +} +.statsWidget p strong { + float: right; + padding-right: 10px; } .questions-related { - word-wrap: break-word; - - p { - line-height: 20px; - padding: 4px 0px 4px 0px; - font-size: 16px; - font-weight:normal; - border-bottom:#cccccc 1px solid; - } - a{ - font-size:13px; - } + word-wrap: break-word; +} +.questions-related p { + line-height: 20px; + padding: 4px 0px 4px 0px; + font-size: 16px; + font-weight: normal; + border-bottom: #cccccc 1px solid; +} +.questions-related a { + font-size: 13px; } /* tips and markdown help are widgets for ask template */ - -#tips{ - li{ - color:@info-text; - font-size:13px; - list-style-image: url(../images/tips.png); - } - a{ - font-size:16px; - } +#tips li { + color: #707070; + font-size: 13px; + list-style-image: url(../images/tips.png); } - -#markdownHelp{ - li{ - color:@info-text; - font-size:13px; - } - a{ - font-size:16px; - } +#tips a { + font-size: 16px; +} +#markdownHelp li { + color: #707070; + font-size: 13px; +} +#markdownHelp a { + font-size: 16px; } - - /* ----- Sorting top Tab, check main_page/tab_bar.html ------*/ - .tabBar { - background-color: #eff5f6; - height: 30px; - margin-bottom: 3px; - margin-top: 3px; - float:right; - font-family:@sort-font; - font-size:16px; - .rounded-corners(5px); + background-color: #eff5f6; + height: 30px; + margin-bottom: 3px; + margin-top: 3px; + float: right; + font-family: Georgia, serif; + font-size: 16px; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; } - .tabBar h2 { - float: left; + float: left; } - .tabsA, .tabsC { - float: right; - position: relative; - display: block; - height: 20px; + float: right; + position: relative; + display: block; + height: 20px; } - /* tabsA - used for sorting */ -.tabsA { float: right; } -.tabsC { float: left; } - -.tabsA a, .tabsC a{ - - border-left: 1px solid #d0e1e4; - color: @section-title; - display: block; - float: left; - height: 20px; - line-height: 20px; - padding:4px 7px 4px 7px; - text-decoration: none; -} - -.tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover { - color: @button-label; -} - -.tabsA a.rev.on, tabsA a.rev.on:hover { +.tabsA { + float: right; +} +.tabsC { + float: left; +} +.tabsA a, .tabsC a { + border-left: 1px solid #d0e1e4; + color: #7ea9b3; + display: block; + float: left; + height: 20px; + line-height: 20px; + padding: 4px 7px 4px 7px; + text-decoration: none; +} +.tabsA a.on, +.tabsC a.on, +.tabsA a:hover, +.tabsC a:hover { + color: #4a757f; } - .tabsA .label, .tabsC .label { - float: left; - color: #646464; - margin-top:4px; - margin-right:5px; + float: left; + color: #646464; + margin-top: 4px; + margin-right: 5px; } - .tabsB a { - background: #eee; - border: 1px solid #eee; - color: #777; - display: block; - float: left; - height: 22px; - line-height: 28px; - margin: 5px 0px 0 4px; - padding: 0 11px 0 11px; - text-decoration: none; + background: #eee; + border: 1px solid #eee; + color: #777; + display: block; + float: left; + height: 22px; + line-height: 28px; + margin: 5px 0px 0 4px; + padding: 0 11px 0 11px; + text-decoration: none; } - .rss { - float: right; - font-size: 16px; - color: #f57900; - margin: 5px 0px 3px 7px; - width:52px; - padding-left: 16px; - padding-top:3px; - background:#fff url(../images/feed-icon-small.png) no-repeat center right; - float:right; - font-family:@sort-font; - font-size:16px; + float: right; + font-size: 16px; + color: #f57900; + margin: 5px 0px 3px 7px; + width: 52px; + padding-left: 16px; + padding-top: 3px; + background: #ffffff url(../images/feed-icon-small.png) no-repeat center right; + float: right; + font-family: Georgia, serif; + font-size: 16px; } - .rss:hover { - color: #F4A731 !important; + color: #F4A731 !important; } - /* ----- Headline, containing number of questions and tags selected, check main_page/headline.html ----- */ - -#questionCount{ - font-weight:bold; - font-size:23px; - color:@section-title; - width:200px; - float:left; - margin-bottom:8px; - padding-top:6px; - font-family:@main-font; -} - -#listSearchTags{ - float:left; - margin-top:3px; - color:@info-text; - font-size:16px; - font-family:@main-font; +#questionCount { + font-weight: bold; + font-size: 23px; + color: #7ea9b3; + width: 200px; + float: left; + margin-bottom: 8px; + padding-top: 6px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +#listSearchTags { + float: left; + margin-top: 3px; + color: #707070; + font-size: 16px; + font-family: 'Yanone Kaffeesatz', sans-serif; } - ul#searchTags { - margin-left:10px; - float:right; - padding-top:2px; + margin-left: 10px; + float: right; + padding-top: 2px; } - .search-tips { - font-size:16px; - line-height:17px; - color: @info-text; - margin:5px 0 10px 0; - padding:0px; - float:left; - font-family:@main-font; - - a { - text-decoration: underline; - color: @link; - } + font-size: 16px; + line-height: 17px; + color: #707070; + margin: 5px 0 10px 0; + padding: 0px; + float: left; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.search-tips a { + text-decoration: underline; + color: #1b79bd; } - /* ----- Question list , check main_page/content.html and macros/macros.html----- */ - #question-list { - float: left; - position: relative; - background-color: #FFF; - padding: 0; - width: 100%; + float: left; + position: relative; + background-color: #FFF; + padding: 0; + width: 100%; } - .short-summary { - position: relative; - filter: inherit; - padding: 10px; - border-bottom: 1px solid #DDDBCE; - margin-bottom:1px; - overflow: hidden; - width: 710px; - float: left; - background: url(../images/summary-background.png) repeat-x; - - h2 { - font-size: 24px; - font-weight:normal; - line-height: 26px; - padding-left: 0; - margin-bottom:8px; - display:block; - font-family:@main-font; - } - - a { - color:@question-link; - } - - .userinfo { - text-align:right; - line-height:16px; - font-family:@body-font; - padding-right:4px; - } - - - .userinfo .relativetime, span.anonymous - { - font-size: 11px; - clear:both; - font-weight: normal; - color: #555; - } - - .userinfo a{ - font-weight:bold; - font-size:11px; - } - - .counts { - float: right; - margin: 4px 0 0 5px; - font-family:@main-font; - } - - .counts .item-count { - padding:0px 5px 0px 5px; - font-size: 25px; - font-family:@main-font; - } - - .counts .votes div, - .counts .views div, - .counts .answers div, - .counts .favorites div - { - margin-top:3px; - font-size: 14px; - line-height:14px; - color: #646464; - } - - .tags { - margin-top: 0; - } - - .votes, .answers, .favorites, .views { - text-align: center; - margin: 0 3px; - padding: 8px 2px 0px 2px; - width: 51px; - float: right; - height:44px; - border:#dbdbd4 1px solid; - } - - .votes{ - background: url(../images/vote-background.png) repeat-x; - } - - .answers{ - background:url(../images/answers-background.png) repeat-x; - } - - .views { - background:url(../images/view-background.png) repeat-x; - } - - .no-votes .item-count { - color: #b1b5b6; - } - .some-votes .item-count { - color: #4a757f; - } - - .no-answers .item-count { - color: #b1b5b6; - } - .some-answers .item-count { - color: #eab243; - } - - .no-views .item-count { - color: #b1b5b6; - } - .some-views .item-count { - color: #d33f00; - } - - .accepted .item-count { - background:url(../images/accept.png) no-repeat top right; - display: block; - text-align: center; - width: 40px; - color: #eab243; - } - - .some-favorites .item-count { - background:#338333; - color:#d0f5a9; - } - .no-favorites .item-count { - background: #eab243; - color: yellow; - } - + position: relative; + filter: inherit; + padding: 10px; + border-bottom: 1px solid #DDDBCE; + margin-bottom: 1px; + overflow: hidden; + width: 710px; + float: left; + background: url(../images/summary-background.png) repeat-x; +} +.short-summary h2 { + font-size: 24px; + font-weight: normal; + line-height: 26px; + padding-left: 0; + margin-bottom: 8px; + display: block; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.short-summary a { + color: #464646; +} +.short-summary .userinfo { + text-align: right; + line-height: 16px; + font-family: Arial; + padding-right: 4px; +} +.short-summary .userinfo .relativetime, .short-summary span.anonymous { + font-size: 11px; + clear: both; + font-weight: normal; + color: #555; +} +.short-summary .userinfo a { + font-weight: bold; + font-size: 11px; +} +.short-summary .counts { + float: right; + margin: 4px 0 0 5px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.short-summary .counts .item-count { + padding: 0px 5px 0px 5px; + font-size: 25px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.short-summary .counts .votes div, +.short-summary .counts .views div, +.short-summary .counts .answers div, +.short-summary .counts .favorites div { + margin-top: 3px; + font-size: 14px; + line-height: 14px; + color: #646464; +} +.short-summary .tags { + margin-top: 0; +} +.short-summary .votes, +.short-summary .answers, +.short-summary .favorites, +.short-summary .views { + text-align: center; + margin: 0 3px; + padding: 8px 2px 0px 2px; + width: 51px; + float: right; + height: 44px; + border: #dbdbd4 1px solid; +} +.short-summary .votes { + background: url(../images/vote-background.png) repeat-x; +} +.short-summary .answers { + background: url(../images/answers-background.png) repeat-x; +} +.short-summary .views { + background: url(../images/view-background.png) repeat-x; +} +.short-summary .no-votes .item-count { + color: #b1b5b6; +} +.short-summary .some-votes .item-count { + color: #4a757f; +} +.short-summary .no-answers .item-count { + color: #b1b5b6; +} +.short-summary .some-answers .item-count { + color: #eab243; +} +.short-summary .no-views .item-count { + color: #b1b5b6; +} +.short-summary .some-views .item-count { + color: #d33f00; +} +.short-summary .accepted .item-count { + background: url(../images/accept.png) no-repeat top right; + display: block; + text-align: center; + width: 40px; + color: #eab243; +} +.short-summary .some-favorites .item-count { + background: #338333; + color: #d0f5a9; +} +.short-summary .no-favorites .item-count { + background: #eab243; + color: yellow; } - /* ----- Question list Paginator , check main_content/pager.html and macros/utils_macros.html----- */ - .evenMore { - font-size: 13px; - color:@info-text; - padding:15px 0px 10px 0px; - clear:both; + font-size: 13px; + color: #707070; + padding: 15px 0px 10px 0px; + clear: both; } - .evenMore a { - text-decoration: underline; - color:@link; + text-decoration: underline; + color: #1b79bd; } - .pager { - margin-top: 10px; - margin-bottom: 16px; + margin-top: 10px; + margin-bottom: 16px; } - .pagesize { - margin-top: 10px; - margin-bottom: 16px; - float: right; + margin-top: 10px; + margin-bottom: 16px; + float: right; } - .paginator { - padding: 5px 0 10px 0; - font-size:13px; - - .prev a, .prev a:visited, - .next a, .next a:visited { - background-color: #fff; - color: #777; - padding: 2px 4px 3px 4px; - } - a{ - color:@section-title; - } - .prev { - margin-right: .5em; - } - - .next { - margin-left: .5em; - } - - .page a, .page a:visited, .curr { - padding: .25em; - background-color: #fff; - margin: 0em .25em; - color: #ff; - } - - .curr { - background-color: #8ebcc7; - color: #fff; - font-weight: bold; - } - .next a, .prev a{ - color:@section-title - } - .page a:hover, - .curr a:hover, - .prev a:hover, - .next a:hover { - color: #8C8C8C; - background-color: #E1E1E1; - text-decoration: none; - } - - .text { - color: #777; - padding: .3em; - } - - .paginator-container-left { - padding: 5px 0 10px 0; - } - + padding: 5px 0 10px 0; + font-size: 13px; +} +.paginator .prev a, +.paginator .prev a:visited, +.paginator .next a, +.paginator .next a:visited { + background-color: #fff; + color: #777; + padding: 2px 4px 3px 4px; +} +.paginator a { + color: #7ea9b3; +} +.paginator .prev { + margin-right: .5em; +} +.paginator .next { + margin-left: .5em; +} +.paginator .page a, .paginator .page a:visited, .paginator .curr { + padding: .25em; + background-color: #fff; + margin: 0em .25em; + color: #ff; +} +.paginator .curr { + background-color: #8ebcc7; + color: #fff; + font-weight: bold; +} +.paginator .next a, .paginator .prev a { + color: #7ea9b3; +} +.paginator .page a:hover, +.paginator .curr a:hover, +.paginator .prev a:hover, +.paginator .next a:hover { + color: #8C8C8C; + background-color: #E1E1E1; + text-decoration: none; +} +.paginator .text { + color: #777; + padding: .3em; +} +.paginator .paginator-container-left { + padding: 5px 0 10px 0; } - /* ----- Tags Styles ----- */ - /* tag formatting is also copy-pasted in template because it must be the same in the emails askbot/models/__init__.py:format_instant_notification_email() */ - /* tag cloud */ - .tag-size-1 { - font-size:12px; + font-size: 12px; } .tag-size-2 { - font-size:13px; + font-size: 13px; } .tag-size-3 { - font-size:14px; + font-size: 14px; } .tag-size-4 { - font-size:15px; + font-size: 15px; } .tag-size-5 { - font-size:16px; + font-size: 16px; } .tag-size-6 { - font-size:17px; + font-size: 17px; } .tag-size-7 { - font-size:18px; + font-size: 18px; } .tag-size-8 { - font-size:19px; + font-size: 19px; } .tag-size-9 { - font-size:20px; + font-size: 20px; } .tag-size-10 { - font-size:21px; + font-size: 21px; } - -ul.tags, -ul.tags.marked-tags, -ul#related-tags { - list-style: none; - margin: 0; - padding: 0; - line-height: 170%; - display: block; +ul.tags, ul.tags.marked-tags, ul#related-tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; } - ul.tags li { - float:left; - display: block; - margin: 0 5px 0 0; - padding: 0; - height:20px; + float: left; + display: block; + margin: 0 5px 0 0; + padding: 0; + height: 20px; } - .wildcard-tags { - clear: both; + clear: both; } - -ul.tags.marked-tags li, -.wildcard-tags ul.tags li { - margin-bottom: 5px; +ul.tags.marked-tags li, .wildcard-tags ul.tags li { + margin-bottom: 5px; } - #tagSelector div.inputs { - clear: both; - float: none; - margin-bottom:10px; + clear: both; + float: none; + margin-bottom: 10px; } - -.tags-page ul.tags li, -ul#ab-user-tags li { - width: 160px; - margin:5px; +.tags-page ul.tags li, ul#ab-user-tags li { + width: 160px; + margin: 5px; } - ul#related-tags li { - margin: 0 5px 5px 0; - float: left; - clear: left; + margin: 0 5px 5px 0; + float: left; + clear: left; } - /* .tag-left and .tag-right are for the sliding doors decoration of tags */ - .tag-left { - background: url(../images/tag-right.png) no-repeat right center; - border: none; - cursor: pointer; - display: block; - float: left; - height: 20px; - margin: 0 5px 0 0; - padding: 0; + background: url(../images/tag-right.png) no-repeat right center; + border: none; + cursor: pointer; + display: block; + float: left; + height: 20px; + margin: 0 5px 0 0; + padding: 0; } - .tag-right { - background:url(../images/tag-left.png) no-repeat left center; - border: none; - display: block; - float: left; - height: 20px; - line-height: 20px; - font-weight: normal; - font-size: 11px; - padding: 0px 10px 0px 15px; - text-decoration: none; - text-align: center; - white-space: nowrap; - vertical-align: middle; - font-family:@body-font; - color:#717179; + background: url(../images/tag-left.png) no-repeat left center; + border: none; + display: block; + float: left; + height: 20px; + line-height: 20px; + font-weight: normal; + font-size: 11px; + padding: 0px 10px 0px 15px; + text-decoration: none; + text-align: center; + white-space: nowrap; + vertical-align: middle; + font-family: Arial; + color: #717179; } .deletable-tag { - margin-right: 3px; - white-space: nowrap; + margin-right: 3px; + white-space: nowrap; } - .deletable-tag .tag-right { - padding-right: 0px; - float: left; + padding-right: 0px; + float: left; } .deletable-tag.tag-left { - padding-right: 0px; + padding-right: 0px; } - -.tags a.tag-right, -.tags span.tag-right { - color: #585858; - text-decoration: none; - +.tags a.tag-right, .tags span.tag-right { + color: #585858; + text-decoration: none; } -.tags a:hover{ - color: #1A1A1A; +.tags a:hover { + color: #1A1A1A; } - .users-page h1, .tags-page h1 { - float: left; + float: left; } - .main-page h1 { - margin-right: 5px; + margin-right: 5px; } - span.delete-icon { - padding-left: 13px; - vertical-align: bottom; - background: url(../images/close-small-dark.png) bottom no-repeat; - cursor: default; + padding-left: 13px; + vertical-align: bottom; + background: url(../images/close-small-dark.png) bottom no-repeat; + cursor: default; } span.delete-icon:hover { - background: url(../images/close-small-dark.png) top no-repeat; + background: url(../images/close-small-dark.png) top no-repeat; } - .tags span.delete-icon { - float: left; - height: 20px; - width:8px; - margin: 0px 0 0 10px; - display: block; + float: left; + height: 20px; + width: 8px; + margin: 0px 0 0 10px; + display: block; } - .tag-number { - font-weight: normal; - float: left; - font-size:16px; - color:#5d5d5d; + font-weight: normal; + float: left; + font-size: 16px; + color: #5d5d5d; } - .badges .tag-number { - float: none; - display: inline; - padding-right: 15px; + float: none; + display: inline; + padding-right: 15px; } - /* ----- Ask and Edit Question Form template----- */ - -.section-title{ - color:@section-title; - font-family:@main-font; - font-weight:bold; - font-size:24px; +.section-title { + color: #7ea9b3; + font-family: 'Yanone Kaffeesatz', sans-serif; + font-weight: bold; + font-size: 24px; } - .ask-body { - padding-right: 10px; + padding-right: 10px; } - -#fmask{ - margin-bottom:30px; - width:100%; +#fmask { + margin-bottom: 30px; + width: 100%; } - #askFormBar { - display:inline-block; - padding: 4px 7px 5px 0px; - margin-top:0px; - - p{ - margin:0 0 5px 0; - font-size:14px; - color:@info-text-dark; - line-height:1.4; - } - .questionTitleInput { - font-size: 24px; - line-height: 24px; - height: 36px; - margin: 0px; - padding: 0px 0 0 5px; - border:#cce6ec 3px solid; - width:725px; - } + display: inline-block; + padding: 4px 7px 5px 0px; + margin-top: 0px; +} +#askFormBar p { + margin: 0 0 5px 0; + font-size: 14px; + color: #525252; + line-height: 1.4; +} +#askFormBar .questionTitleInput { + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 725px; +} +.ask-page div#question-list, .edit-question-page div#question-list { + float: none; + border-bottom: #f0f0ec 1px solid; + float: left; + margin-bottom: 10px; +} +.ask-page div#question-list a, .edit-question-page div#question-list a { + line-height: 30px; +} +.ask-page div#question-list h2, .edit-question-page div#question-list h2 { + font-size: 13px; + padding-bottom: 0; + color: #1b79bd; + border-top: #f0f0ec 1px solid; + border-left: #f0f0ec 1px solid; + height: 30px; + line-height: 30px; + font-weight: normal; +} +.ask-page div#question-list span, .edit-question-page div#question-list span { + width: 28px; + height: 26px; + line-height: 26px; + text-align: center; + margin-right: 10px; + float: left; + display: block; + color: #fff; + background: #b8d0d5; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; +} +.ask-page label, .edit-question-page label { + color: #525252; + font-size: 13px; +} +.ask-page #id_tags, .edit-question-page #id_tags { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; } - -.ask-page, .edit-question-page{ - - div#question-list { - float: none; - border-bottom:#f0f0ec 1px solid; - float:left; - margin-bottom:10px; - a{ - line-height:30px; - } - - } - - div#question-list h2 { - font-size: 13px; - padding-bottom: 0; - color:@link; - border-top:#f0f0ec 1px solid; - border-left:#f0f0ec 1px solid; - height:30px; - line-height:30px; - font-weight:normal; - } - - div#question-list span { - width:28px; - height:26px; - line-height:26px; - text-align:center; - margin-right: 10px; - float:left; - display:block; - color:#fff; - background: #b8d0d5; - .rounded-corners(3px); - } - label{ - color:@info-text-dark; - font-size:13px; - } - - #id_tags{ - border:#cce6ec 3px solid; - height:25px; - padding-left:5px; - width:395px; - font-size:14px; - } -} - .title-desc { - color: @info-text; - font-size: 13px; + color: #707070; + font-size: 13px; +} +#fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit { + float: left; + background: url(../images/medium-button.png) top repeat-x; + height: 34px; + border: 0; + font-family: 'Yanone Kaffeesatz', sans-serif; + color: #4a757f; + font-weight: normal; + font-size: 21px; + margin-top: 3px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + margin-right: 7px; +} +#fmanswer input.submit:hover, .ask-page input.submit:hover, .edit-question-page input.submit:hover { + text-decoration: none; + background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; +} +#editor { + /*adjustment for editor preview*/ + + font-size: 100%; + min-height: 200px; + line-height: 18px; + margin: 0; + border-left: #cce6ec 3px solid; + border-bottom: #cce6ec 3px solid; + border-right: #cce6ec 3px solid; + border-top: 0; + padding: 10px; + margin-bottom: 10px; + width: 710px; } - -#fmanswer input.submit, -.ask-page input.submit, -.edit-question-page input.submit { - float: left; - background: url(../images/medium-button.png) top repeat-x; - height:34px; - border:0; - font-family:@main-font; - color:@button-label; - font-weight:normal; - font-size:21px; - margin-top:3px; - .rounded-corners(4px); - .box-shadow(1px, 1px, 2px, #636363); - margin-right:7px; -} - -#fmanswer input.submit:hover, -.ask-page input.submit:hover, -.edit-question-page input.submit:hover{ - text-decoration:none; - background: url(../images/medium-button.png) bottom repeat-x; - .text-shadow(0px, 1px, 0px, #c6d9dd) -} -#editor { /*adjustment for editor preview*/ - font-size: 100%; - min-height: 200px; - line-height: 18px; - margin:0; - border-left:#cce6ec 3px solid; - border-bottom:#cce6ec 3px solid; - border-right:#cce6ec 3px solid; - border-top:0; - padding:10px; - margin-bottom:10px; - width:710px; -} - #id_title { - width: 100%; + width: 100%; } - .wmd-preview { - margin: 3px 0 5px 0; - padding: 6px; - background-color: #F5F5F5; - min-height: 20px; - overflow: auto; - font-size:13px; - font-family:@body-font; - - p{ - margin-bottom:14px; - line-height:1.4; - font-size:14px; - } + margin: 3px 0 5px 0; + padding: 6px; + background-color: #F5F5F5; + min-height: 20px; + overflow: auto; + font-size: 13px; + font-family: Arial; +} +.wmd-preview p { + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; } - .wmd-preview pre { - background-color: #E7F1F8; - + background-color: #E7F1F8; } - .wmd-preview blockquote { - background-color: #eee; + background-color: #eee; } - .wmd-preview IMG { - max-width: 600px; + max-width: 600px; } - .preview-toggle { - width: 100%; - color: #b6a475; /*letter-spacing:1px;*/ - text-align: left; -} + width: 100%; + color: #b6a475; + /*letter-spacing:1px;*/ + text-align: left; +} .preview-toggle span:hover { - cursor: pointer; + cursor: pointer; } - .after-editor { - margin-top: 10px; + margin-top: 10px; } - .checkbox { - margin-left:5px; - font-weight:normal; - cursor:help + margin-left: 5px; + font-weight: normal; + cursor: help; } - .question-options { - margin-top: 1px; - color: #666; - line-height: 13px; - margin-bottom:5px; + margin-top: 1px; + color: #666; + line-height: 13px; + margin-bottom: 5px; } .question-options label { - vertical-align: text-bottom; + vertical-align: text-bottom; } - .edit-content-html { - border-top: 1px dotted #D8D2A9; - border-bottom: 1px dotted #D8D2A9; - margin: 5px 0 5px 0; -} - -.edit-question-page, #fmedit{ - color:@info-text-dark; - - #id_revision{ - font-size:14px; - margin-top:5px; - margin-bottom:5px; - } - #id_title{ - font-size: 24px; - line-height: 24px; - height: 36px; - margin: 0px; - padding: 0px 0 0 5px; - border:#cce6ec 3px solid; - width:725px; - margin-bottom:10px; - } - #id_summary{ - border:#cce6ec 3px solid; - height:25px; - padding-left:5px; - width:395px; - font-size:14px; - } - .title-desc{ - margin-bottom:10px; - } + border-top: 1px dotted #D8D2A9; + border-bottom: 1px dotted #D8D2A9; + margin: 5px 0 5px 0; +} +.edit-question-page, #fmedit { + color: #525252; +} +.edit-question-page #id_revision, #fmedit #id_revision { + font-size: 14px; + margin-top: 5px; + margin-bottom: 5px; +} +.edit-question-page #id_title, #fmedit #id_title { + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 725px; + margin-bottom: 10px; +} +.edit-question-page #id_summary, #fmedit #id_summary { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; +} +.edit-question-page .title-desc, #fmedit .title-desc { + margin-bottom: 10px; } - /* ----- Question template ----- */ - -.question-page{ - - h1{ - padding-top:0px; - font-family:@main-font; - } - - h1 a{ - color:@question-link; - font-size:30px; - font-weight:normal; - line-height:1; - } - - p.rss { - float:none; - clear:both; - padding: 3px 0 0 23px; - font-size: 15px; - width:110px; - background-position:center left; - margin-left:0px !important; - } - - p.rss a { - font-family:@main-font; - vertical-align: top; - } - - .question-content{ - float:right; - width:690px; - margin-bottom:10px; - } - - #question-table{ - float:left; - border-top:#f0f0f0 1px solid; - } - - #question-table, - .answer-table { - margin: 6px 0 0px 0; - border-spacing: 0px; - width: 680px; - padding-right:3px; - } - - .answer-table { - margin-top:0px; - border-bottom: 1px solid #D4D4D4; - float:left; - } - - .answer-table td, - #question-table td { - width:20px; - vertical-align:top; - } - .question-body, .answer-body { - overflow: auto; - margin-top:10px; - font-family:@body-font; - color:#4b4b4b; - - p{ - margin-bottom:14px; - line-height:1.4; - font-size:14px; - padding:0px 5px 5px 0px; - } - - a { - color:@link; - } - - li { - margin-bottom:7px; - } - } - - .question-body IMG, .answer-body IMG { - max-width: 600px; - } - - .post-update-info-container { - float: right; - width: 175px; - } - - .post-update-info { - background: #fff url(../images/background-user-info.png) repeat-x bottom; - float: right; - font-size: 9px; - font-family:@secondary-font; - width: 158px; - padding:4px; - margin:0px 0px 5px 5px; - line-height: 14px; - .rounded-corners(4px); - .box-shadow (0px, 2px,1px,#bfbfbf); - - p { - line-height: 13px; - font-size: 11px; - margin: 0 0 2px 1px; - padding: 0; - } - a{ - color:#444; - } - .gravatar { - float: left; - margin-right: 4px; - } - - p.tip { - color: #444; - line-height: 13px; - font-size: 10px; - } - } - - .post-controls{ - font-size: 11px; - line-height: 12px; - min-width: 200px; - padding-left: 5px; - text-align:right; - clear: left; - float: right; - margin-top:10px; - - a { - color: #777; - padding: 0px 3px 3px 22px; - cursor: pointer; - border: none; - font-size:12px; - font-family:@body-font; - text-decoration: none; - height:18px; - display:block; - float:right; - line-height:18px; - margin-top:-2px; - margin-left:4px; - } - - a:hover { - background-color: #f5f0c9; - - } - .sep { - color: #ccc; - float:right; - height:18px; - font-size:18px; - } - } - .post-controls, .answer-controls{ - .question-delete{ - background: url(../images/delete.png) no-repeat center left; - padding-left:16px; - } - .question-flag{ - background: url(../images/flag.png) no-repeat center left; - } - .question-edit{ - background: url(../images/edit2.png) no-repeat center left; - } - .question-retag{ - background: url(../images/retag.png) no-repeat center left; - } - .question-close{ - background: url(../images/close.png) no-repeat center left; - } - .permant-link{ - background: url(../images/link.png) no-repeat center left; - } - } - .tabBar{ - width:100%; - } - - #questionCount{ - float:left; - font-family:@main-font; - line-height:15px; - } - - .question-img-upvote, .question-img-downvote, - .answer-img-upvote, .answer-img-downvote { - width: 25px; - height: 20px; - cursor:pointer; - } - - .question-img-upvote, .answer-img-upvote { - background: url(../images/vote-arrow-up-new.png) no-repeat; - } - - .question-img-downvote, .answer-img-downvote { - background: url(../images/vote-arrow-down-new.png) no-repeat; - } - - .question-img-upvote:hover, .question-img-upvote.on, - .answer-img-upvote:hover, .answer-img-upvote.on { - background: url(../images/vote-arrow-up-on-new.png) no-repeat; - } - - .question-img-downvote:hover, .question-img-downvote.on, - .answer-img-downvote:hover, .answer-img-downvote.on { - background: url(../images/vote-arrow-down-on-new.png) no-repeat; - } - - .question-img-favorite:hover { - background: url(../images/vote-favorite-on.png) - } - div.comments { - padding: 0; - } - #comment-title{ - font-weight:bold; - font-size:23px; - color:@section-title; - width:200px; - float:left; - font-family:@main-font; - } - .comments { - font-size: 12px; - clear: both; - - div.controls { - clear: both; - float:left; - width: 100%; - margin: 3px 0 20px 5px; - } - - .controls a { - color: #988e4c; - padding: 0 3px 2px 22px; - font-family:@body-font; - font-size:13px; - background:url(../images/comment.png) no-repeat center left; - } - - .controls a:hover { - background-color: #f5f0c9; - text-decoration: none; - } - - .button { - color: #988e4c; - font-size: 11px; - padding: 3px; - cursor: pointer; - } - a { - background-color: inherit; - color: @link; - padding: 0; - } - - form.post-comments { - margin: 3px 30px 4px 5px; - } - - textarea { - height: 42px; - width:100%; - margin: 12px 0 5px 1px; - font-family: @body-font; - outline: none; - overflow:auto; - font-size: 12px; - line-height: 140%; - padding-left:2px; - padding-top:4px; - border:#cce6ec 3px solid; - } - - input { - margin-left: 10px; - margin-top: 1px; - vertical-align: top; - width: 100px; - } - button{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-size:12px; - width:95px; - font-weight:bold; - height:24px; - margin-top:-2px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); - float:left; - } - button:hover{ - background: url(../images/small-button-blue.png) bottom repeat-x; - .text-shadow(0px, 1px, 0px, #c6d9dd); - } - .counter { - display: inline-block; - width: 245px; - float:right; - color:#b6a475 !important; - vertical-align: top; - font-family:@body-font; - float:right; - text-align:right; - } - .comment { - border-bottom: 1px solid #edeeeb; - margin: 0; - margin-top:8px; - padding-bottom:4px; - overflow: auto; - font-family:@body-font; - font-size:11px; - min-height: 25px; - background:url(../images/comment-background.png) bottom repeat-x; - .rounded-corners(5px); - } - div.comment:hover { - background-color: #efefef; - } - a.author{ - background-color: inherit; - color: @link; - padding: 0; - } - - a.author:hover { - text-decoration: underline; - } - span.delete-icon{ - background:url(../images/close-small.png) no-repeat; - } - span.delete-icon:hover{ - border:#BC564B 2px solid; - .rounded-corners(10px); - - } - .content { - margin-bottom: 7px; - } - - .comment-votes { - float: left; - width: 37px; - line-height: 130%; - padding: 6px 5px 6px 3px; - } - - .comment-body { - line-height: 1.3; - margin: 3px 26px 0 46px; - padding: 5px 3px; - color: #666; - font-size:13px; - } - - .comment-body p{ - font-size:13px; - line-height:1.3; - margin-bottom: 3px; - padding: 0; - } - - .comment-delete { - float: right; - width: 14px; - line-height: 130%; - padding: 8px 6px; - } - - .upvote { - margin: 0px; - padding-right: 17px; - padding-top: 2px; - text-align: right; - height: 20px; - font-size: 13px; - font-weight: bold; - color: #777; - } - - .upvote.upvoted { - color: #d64000; - } - - .upvote.hover { - background: url(../images/go-up-grey.png) no-repeat; - background-position: right 1px; - } - - .upvote:hover { - background: url(../images/go-up-orange.png) no-repeat; - background-position: right 1px; - } - - .help-text{ - float: right; - text-align:right; - color: gray; - margin-bottom: 0px; - margin-top: 0px; - line-height: 50%; - } - } - #questionTools { - font-size: 22px; - margin-top: 11px; - text-align: left; - } - - .question-status { - margin-top: 10px; - margin-bottom:15px; - padding: 20px; - background-color: #fef7cc; - text-align: center; - border:#e1c04a 1px solid; - } - - .question-status h3 { - font-size: 20px; - color:@info-text; - font-weight:normal; - } - - .vote-buttons { - float: left; - text-align: center; - padding-top: 2px; - margin:3px 10px 0px 3px; - } - - .vote-buttons IMG { - cursor: pointer; - } - - .vote-number { - font-family: @main-font; - padding: 0px 0 5px 0; - font-size: 25px; - font-weight: bold; - color: #777; - } - - .vote-buttons .notify-sidebar { - text-align: left; - } - .vote-buttons .notify-sidebar label { - vertical-align: top; - } - - .tabBar-answer{ - margin-bottom:15px; - padding-left:7px; - width:723px; - margin-top:10px; - } - .answer{ - .vote-buttons { - float:left; - } - } - .accepted-answer { - background-color: #f7fecc; - border-bottom-color: #9BD59B; - - .vote-buttons { - width:27px; - margin-right:10px; - } - } - - .answer .post-update-info a{ - color:#444444; - } - - .accepted-answer .comments { - background-color: #f1f6d4; - } - - .answered { - background: #CCC; - color: #999; - } - - .answered-accepted { - background: #DCDCDC; - color: #763333; - - strong { - color: #E1E818; - } - } - - .answered-by-owner { - background: #F1F1FF; - - .comments .button { - background-color: #E6ECFF; - } - .comments { - background-color: #E6ECFF; - } - .vote-buttons { - margin-right:10px; - } - } - - .answer-img-accept:hover { - background: url(../images/vote-accepted-on.png) - } - .answer-body a { - color:@link; - } - .answer-body li { - margin-bottom:0.7em; - } - - #fmanswer{ - color:@info-text; - line-height:1.2; - margin-top:10px; - p{ - font-size:13px; - line-height:1.3; - } - h2{ - font-family:@main-font; - color:@section-title; - font-size:24px; - } - label{ - font-size:13px; - } - } - .message { - padding: 5px; - margin: 0px 0 10px 0; - - } - +.question-page h1 { + padding-top: 0px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.question-page h1 a { + color: #464646; + font-size: 30px; + font-weight: normal; + line-height: 1; +} +.question-page p.rss { + float: none; + clear: both; + padding: 3px 0 0 23px; + font-size: 15px; + width: 110px; + background-position: center left; + margin-left: 0px !important; +} +.question-page p.rss a { + font-family: 'Yanone Kaffeesatz', sans-serif; + vertical-align: top; +} +.question-page .question-content { + float: right; + width: 690px; + margin-bottom: 10px; +} +.question-page #question-table { + float: left; + border-top: #f0f0f0 1px solid; +} +.question-page #question-table, .question-page .answer-table { + margin: 6px 0 0px 0; + border-spacing: 0px; + width: 680px; + padding-right: 3px; +} +.question-page .answer-table { + margin-top: 0px; + border-bottom: 1px solid #D4D4D4; + float: left; +} +.question-page .answer-table td, .question-page #question-table td { + width: 20px; + vertical-align: top; +} +.question-page .question-body, .question-page .answer-body { + overflow: auto; + margin-top: 10px; + font-family: Arial; + color: #4b4b4b; +} +.question-page .question-body p, .question-page .answer-body p { + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; + padding: 0px 5px 5px 0px; +} +.question-page .question-body a, .question-page .answer-body a { + color: #1b79bd; +} +.question-page .question-body li, .question-page .answer-body li { + margin-bottom: 7px; +} +.question-page .question-body IMG, .question-page .answer-body IMG { + max-width: 600px; +} +.question-page .post-update-info-container { + float: right; + width: 175px; +} +.question-page .post-update-info { + background: #ffffff url(../images/background-user-info.png) repeat-x bottom; + float: right; + font-size: 9px; + font-family: Arial; + width: 158px; + padding: 4px; + margin: 0px 0px 5px 5px; + line-height: 14px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 0px 2px 1px #bfbfbf; + -moz-box-shadow: 0px 2px 1px #bfbfbf; + box-shadow: 0px 2px 1px #bfbfbf; +} +.question-page .post-update-info p { + line-height: 13px; + font-size: 11px; + margin: 0 0 2px 1px; + padding: 0; +} +.question-page .post-update-info a { + color: #444; +} +.question-page .post-update-info .gravatar { + float: left; + margin-right: 4px; +} +.question-page .post-update-info p.tip { + color: #444; + line-height: 13px; + font-size: 10px; +} +.question-page .post-controls { + font-size: 11px; + line-height: 12px; + min-width: 200px; + padding-left: 5px; + text-align: right; + clear: left; + float: right; + margin-top: 10px; +} +.question-page .post-controls a { + color: #777; + padding: 0px 3px 3px 22px; + cursor: pointer; + border: none; + font-size: 12px; + font-family: Arial; + text-decoration: none; + height: 18px; + display: block; + float: right; + line-height: 18px; + margin-top: -2px; + margin-left: 4px; +} +.question-page .post-controls a:hover { + background-color: #f5f0c9; +} +.question-page .post-controls .sep { + color: #ccc; + float: right; + height: 18px; + font-size: 18px; +} +.question-page .post-controls .question-delete, .question-page .answer-controls .question-delete { + background: url(../images/delete.png) no-repeat center left; + padding-left: 16px; +} +.question-page .post-controls .question-flag, .question-page .answer-controls .question-flag { + background: url(../images/flag.png) no-repeat center left; +} +.question-page .post-controls .question-edit, .question-page .answer-controls .question-edit { + background: url(../images/edit2.png) no-repeat center left; +} +.question-page .post-controls .question-retag, .question-page .answer-controls .question-retag { + background: url(../images/retag.png) no-repeat center left; +} +.question-page .post-controls .question-close, .question-page .answer-controls .question-close { + background: url(../images/close.png) no-repeat center left; +} +.question-page .post-controls .permant-link, .question-page .answer-controls .permant-link { + background: url(../images/link.png) no-repeat center left; +} +.question-page .tabBar { + width: 100%; +} +.question-page #questionCount { + float: left; + font-family: 'Yanone Kaffeesatz', sans-serif; + line-height: 15px; +} +.question-page .question-img-upvote, +.question-page .question-img-downvote, +.question-page .answer-img-upvote, +.question-page .answer-img-downvote { + width: 25px; + height: 20px; + cursor: pointer; +} +.question-page .question-img-upvote, .question-page .answer-img-upvote { + background: url(../images/vote-arrow-up-new.png) no-repeat; +} +.question-page .question-img-downvote, .question-page .answer-img-downvote { + background: url(../images/vote-arrow-down-new.png) no-repeat; +} +.question-page .question-img-upvote:hover, +.question-page .question-img-upvote.on, +.question-page .answer-img-upvote:hover, +.question-page .answer-img-upvote.on { + background: url(../images/vote-arrow-up-on-new.png) no-repeat; +} +.question-page .question-img-downvote:hover, +.question-page .question-img-downvote.on, +.question-page .answer-img-downvote:hover, +.question-page .answer-img-downvote.on { + background: url(../images/vote-arrow-down-on-new.png) no-repeat; +} +.question-page .question-img-favorite:hover { + background: url(../images/vote-favorite-on.png); +} +.question-page div.comments { + padding: 0; +} +.question-page #comment-title { + font-weight: bold; + font-size: 23px; + color: #7ea9b3; + width: 200px; + float: left; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +.question-page .comments { + font-size: 12px; + clear: both; +} +.question-page .comments div.controls { + clear: both; + float: left; + width: 100%; + margin: 3px 0 20px 5px; +} +.question-page .comments .controls a { + color: #988e4c; + padding: 0 3px 2px 22px; + font-family: Arial; + font-size: 13px; + background: url(../images/comment.png) no-repeat center left; +} +.question-page .comments .controls a:hover { + background-color: #f5f0c9; + text-decoration: none; +} +.question-page .comments .button { + color: #988e4c; + font-size: 11px; + padding: 3px; + cursor: pointer; +} +.question-page .comments a { + background-color: inherit; + color: #1b79bd; + padding: 0; +} +.question-page .comments form.post-comments { + margin: 3px 30px 4px 5px; +} +.question-page .comments textarea { + height: 42px; + width: 100%; + margin: 12px 0 5px 1px; + font-family: Arial; + outline: none; + overflow: auto; + font-size: 12px; + line-height: 140%; + padding-left: 2px; + padding-top: 4px; + border: #cce6ec 3px solid; +} +.question-page .comments input { + margin-left: 10px; + margin-top: 1px; + vertical-align: top; + width: 100px; +} +.question-page .comments button { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-size: 12px; + width: 95px; + font-weight: bold; + height: 24px; + margin-top: -2px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; + float: left; +} +.question-page .comments button:hover { + background: url(../images/small-button-blue.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; +} +.question-page .comments .counter { + display: inline-block; + width: 245px; + float: right; + color: #b6a475 !important; + vertical-align: top; + font-family: Arial; + float: right; + text-align: right; +} +.question-page .comments .comment { + border-bottom: 1px solid #edeeeb; + margin: 0; + margin-top: 8px; + padding-bottom: 4px; + overflow: auto; + font-family: Arial; + font-size: 11px; + min-height: 25px; + background: url(../images/comment-background.png) bottom repeat-x; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; +} +.question-page .comments div.comment:hover { + background-color: #efefef; +} +.question-page .comments a.author { + background-color: inherit; + color: #1b79bd; + padding: 0; +} +.question-page .comments a.author:hover { + text-decoration: underline; +} +.question-page .comments span.delete-icon { + background: url(../images/close-small.png) no-repeat; +} +.question-page .comments span.delete-icon:hover { + border: #BC564B 2px solid; + border-radius: 10px; + -ms-border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + -khtml-border-radius: 10px; +} +.question-page .comments .content { + margin-bottom: 7px; +} +.question-page .comments .comment-votes { + float: left; + width: 37px; + line-height: 130%; + padding: 6px 5px 6px 3px; +} +.question-page .comments .comment-body { + line-height: 1.3; + margin: 3px 26px 0 46px; + padding: 5px 3px; + color: #666; + font-size: 13px; +} +.question-page .comments .comment-body p { + font-size: 13px; + line-height: 1.3; + margin-bottom: 3px; + padding: 0; +} +.question-page .comments .comment-delete { + float: right; + width: 14px; + line-height: 130%; + padding: 8px 6px; +} +.question-page .comments .upvote { + margin: 0px; + padding-right: 17px; + padding-top: 2px; + text-align: right; + height: 20px; + font-size: 13px; + font-weight: bold; + color: #777; +} +.question-page .comments .upvote.upvoted { + color: #d64000; +} +.question-page .comments .upvote.hover { + background: url(../images/go-up-grey.png) no-repeat; + background-position: right 1px; +} +.question-page .comments .upvote:hover { + background: url(../images/go-up-orange.png) no-repeat; + background-position: right 1px; +} +.question-page .comments .help-text { + float: right; + text-align: right; + color: gray; + margin-bottom: 0px; + margin-top: 0px; + line-height: 50%; +} +.question-page #questionTools { + font-size: 22px; + margin-top: 11px; + text-align: left; +} +.question-page .question-status { + margin-top: 10px; + margin-bottom: 15px; + padding: 20px; + background-color: #fef7cc; + text-align: center; + border: #e1c04a 1px solid; +} +.question-page .question-status h3 { + font-size: 20px; + color: #707070; + font-weight: normal; +} +.question-page .vote-buttons { + float: left; + text-align: center; + padding-top: 2px; + margin: 3px 10px 0px 3px; +} +.question-page .vote-buttons IMG { + cursor: pointer; +} +.question-page .vote-number { + font-family: 'Yanone Kaffeesatz', sans-serif; + padding: 0px 0 5px 0; + font-size: 25px; + font-weight: bold; + color: #777; +} +.question-page .vote-buttons .notify-sidebar { + text-align: left; +} +.question-page .vote-buttons .notify-sidebar label { + vertical-align: top; +} +.question-page .tabBar-answer { + margin-bottom: 15px; + padding-left: 7px; + width: 723px; + margin-top: 10px; +} +.question-page .answer .vote-buttons { + float: left; +} +.question-page .accepted-answer { + background-color: #f7fecc; + border-bottom-color: #9BD59B; +} +.question-page .accepted-answer .vote-buttons { + width: 27px; + margin-right: 10px; +} +.question-page .answer .post-update-info a { + color: #444444; +} +.question-page .accepted-answer .comments { + background-color: #f1f6d4; +} +.question-page .answered { + background: #CCC; + color: #999; +} +.question-page .answered-accepted { + background: #DCDCDC; + color: #763333; +} +.question-page .answered-accepted strong { + color: #E1E818; +} +.question-page .answered-by-owner { + background: #F1F1FF; +} +.question-page .answered-by-owner .comments .button { + background-color: #E6ECFF; +} +.question-page .answered-by-owner .comments { + background-color: #E6ECFF; +} +.question-page .answered-by-owner .vote-buttons { + margin-right: 10px; +} +.question-page .answer-img-accept:hover { + background: url(../images/vote-accepted-on.png); +} +.question-page .answer-body a { + color: #1b79bd; +} +.question-page .answer-body li { + margin-bottom: 0.7em; +} +.question-page #fmanswer { + color: #707070; + line-height: 1.2; + margin-top: 10px; } - -.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { - background: url(../images/socialsprite.png) no-repeat; - display:block; - text-indent:-100em; - height:25px; - width:25px; - margin-bottom:3px; +.question-page #fmanswer p { + font-size: 13px; + line-height: 1.3; } - -.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover{ - opacity:0.8; - filter: alpha(opacity=80); +.question-page #fmanswer h2 { + font-family: 'Yanone Kaffeesatz', sans-serif; + color: #7ea9b3; + font-size: 24px; +} +.question-page #fmanswer label { + font-size: 13px; +} +.question-page .message { + padding: 5px; + margin: 0px 0 10px 0; +} +.facebook-share.icon, +.twitter-share.icon, +.linkedin-share.icon, +.identica-share.icon { + background: url(../images/socialsprite.png) no-repeat; + display: block; + text-indent: -100em; + height: 25px; + width: 25px; + margin-bottom: 3px; +} +.facebook-share.icon:hover, +.twitter-share.icon:hover, +.linkedin-share.icon:hover, +.identica-share.icon:hover { + opacity: 0.8; + filter: alpha(opacity=80); } - .facebook-share.icon { - background-position: -26px 0px; + background-position: -26px 0px; } .identica-share.icon { - background-position: -78px 0px; + background-position: -78px 0px; } .twitter-share.icon { - margin-top:10px; - background-position: 0px 0px; + margin-top: 10px; + background-position: 0px 0px; } .linkedin-share.icon { - background-position: -52px 0px; + background-position: -52px 0px; } - /* -----Content pages, Login, About, FAQ, Users----- */ - -.openid-signin, -.meta, -.users-page, -{ - font-size:13px; - line-height:1.3; - color:@info-text-dark; - p{ - font-size:13px; - color:@info-text; - line-height:1.3; - font-family:@body-font; - color:@info-text-dark; - margin-bottom:12px; - } - h2{ - color:@info-text-dark; - padding-left:0px; - font-size:16px; - } - #id_email,#id_name{ - border:#cce6ec 3px solid; - height:25px; - padding-left:5px; - width:395px; - font-size:14px; - } - textarea{ - border:#cce6ec 3px solid; - padding-left:5px; - padding-top:5px; - width:395px; - font-size:14px; - } - input.submit{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-weight:bold; - font-size:12px; - height:24px; - margin-top:-2px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080); - } - input.submit:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; - text-decoration:none; - } - .cancel{ - background:url(../images/small-button-cancel.png) repeat-x top !important; - color:#525252 !important; - } - .cancel:hover{ - background:url(../images/small-button-cancel.png) repeat-x bottom !important; - } -} - -#email-input-fs,#local_login_buttons,#password-fs,#openid-fs{ - margin-top:10px; - #id_email,#id_username,#id_password,input{ - font-size: 12px; - line-height: 20px; - height: 20px; - margin: 0px; - padding: 0px 0 0 5px; - border:#cce6ec 3px solid; - width:200px; - } - .submit-b{ - background:url(../images/small-button-blue.png) repeat-x top; - border:0; - color:@button-label; - font-weight:bold; - font-size:12px; - height:24px; - margin-top:-2px; - cursor:pointer; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080) - } - .submit-b:hover{ - background:url(../images/small-button-blue.png) repeat-x bottom; - } +.openid-signin, .meta, .users-page { + font-size: 13px; + line-height: 1.3; + color: #525252; +} +.openid-signin p, .meta p, .users-page p { + font-size: 13px; + color: #707070; + line-height: 1.3; + font-family: Arial; + color: #525252; + margin-bottom: 12px; +} +.openid-signin h2, .meta h2, .users-page h2 { + color: #525252; + padding-left: 0px; + font-size: 16px; +} +.openid-signin #id_email, +.meta #id_email, +.users-page #id_email, +.openid-signin #id_name, +.meta #id_name, +.users-page #id_name { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; +} +.openid-signin textarea, .meta textarea, .users-page textarea { + border: #cce6ec 3px solid; + padding-left: 5px; + padding-top: 5px; + width: 395px; + font-size: 14px; +} +.openid-signin input.submit, .meta input.submit, .users-page input.submit { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 12px; + height: 24px; + margin-top: -2px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; +} +.openid-signin input.submit:hover, .meta input.submit:hover, .users-page input.submit:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; + text-decoration: none; +} +.openid-signin .cancel, .meta .cancel, .users-page .cancel { + background: url(../images/small-button-cancel.png) repeat-x top !important; + color: #525252 !important; +} +.openid-signin .cancel:hover, .meta .cancel:hover, .users-page .cancel:hover { + background: url(../images/small-button-cancel.png) repeat-x bottom !important; +} +#email-input-fs, +#local_login_buttons, +#password-fs, +#openid-fs { + margin-top: 10px; +} +#email-input-fs #id_email, +#local_login_buttons #id_email, +#password-fs #id_email, +#openid-fs #id_email, +#email-input-fs #id_username, +#local_login_buttons #id_username, +#password-fs #id_username, +#openid-fs #id_username, +#email-input-fs #id_password, +#local_login_buttons #id_password, +#password-fs #id_password, +#openid-fs #id_password, +#email-input-fs input, +#local_login_buttons input, +#password-fs input, +#openid-fs input { + font-size: 12px; + line-height: 20px; + height: 20px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 200px; +} +#email-input-fs .submit-b, +#local_login_buttons .submit-b, +#password-fs .submit-b, +#openid-fs .submit-b { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 12px; + height: 24px; + margin-top: -2px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; +} +#email-input-fs .submit-b:hover, +#local_login_buttons .submit-b:hover, +#password-fs .submit-b:hover, +#openid-fs .submit-b:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; } .openid-input { - background: url(../images/openid.gif) no-repeat; - padding-left: 15px; - cursor: pointer; + background: url(../images/openid.gif) no-repeat; + padding-left: 15px; + cursor: pointer; } - .openid-login-input { - background-position: center left; - background: url(../images/openid.gif) no-repeat 0% 50%; - padding: 5px 5px 5px 15px; - cursor: pointer; - font-family: Trebuchet MS; - font-weight: 300; - font-size: 150%; - width: 500px; + background-position: center left; + background: url(../images/openid.gif) no-repeat 0% 50%; + padding: 5px 5px 5px 15px; + cursor: pointer; + font-family: Trebuchet MS; + font-weight: 300; + font-size: 150%; + width: 500px; } - .openid-login-submit { - height: 40px; - width: 80px; - line-height: 40px; - cursor: pointer; - border: 1px solid #777; - font-weight: bold; - font-size: 120%; + height: 40px; + width: 80px; + line-height: 40px; + cursor: pointer; + border: 1px solid #777; + font-weight: bold; + font-size: 120%; } - /* People page */ - -.tabBar-user{ - width:375px; +.tabBar-user { + width: 375px; } - .user { - padding: 5px; - line-height: 140%; - width: 166px; - border:#eee 1px solid; - margin-bottom:5px; - .rounded-corners(3px); - .user-micro-info{ - color:@info-text-dark; - } - + padding: 5px; + line-height: 140%; + width: 166px; + border: #eee 1px solid; + margin-bottom: 5px; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; +} +.user .user-micro-info { + color: #525252; } - .user ul { - margin: 0; - list-style-type: none; + margin: 0; + list-style-type: none; } - .user .thumb { - clear: both; - float: left; - margin-right: 4px; - display: inline; + clear: both; + float: left; + margin-right: 4px; + display: inline; } - /* tags page */ - -.tabBar-tags{ - width:270px; - margin-bottom:15px; +.tabBar-tags { + width: 270px; + margin-bottom: 15px; } - /* badges page */ - a.medal { - font-size: 17px; - line-height: 250%; - margin-right:5px; - 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; + font-size: 17px; + line-height: 250%; + margin-right: 5px; + 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; } - a:hover.medal { - color: #333; - text-decoration: none; - background: url(../images/medala_on.gif) no-repeat; - border-left: 1px solid #E7E296; - border-top: 1px solid #E7E296; - border-bottom: 1px solid #D1CA3D; - border-right: 1px solid #D1CA3D; + color: #333; + text-decoration: none; + background: url(../images/medala_on.gif) no-repeat; + border-left: 1px solid #E7E296; + border-top: 1px solid #E7E296; + border-bottom: 1px solid #D1CA3D; + border-right: 1px solid #D1CA3D; +} +#award-list .user { + float: left; + margin: 5px; } - -#award-list{ - .user{ - float:left; - margin:5px; - } -} - /* profile page */ - -.tabBar-profile{ - width:100%; - margin-bottom:15px; - float:left; +.tabBar-profile { + width: 100%; + margin-bottom: 15px; + float: left; } - -.user-profile-page{ - font-size:13px; - color:@info-text-dark; - - p{ - font-size:13px; - line-height:1.3; - color:@info-text-dark; - } - .avatar img{ - border:#eee 1px solid; - padding:5px; - } - h2{ - padding:10px 0px 10px 0px; - font-family:@main-font; - } +.user-profile-page { + font-size: 13px; + color: #525252; +} +.user-profile-page p { + font-size: 13px; + line-height: 1.3; + color: #525252; +} +.user-profile-page .avatar img { + border: #eee 1px solid; + padding: 5px; +} +.user-profile-page h2 { + padding: 10px 0px 10px 0px; + font-family: 'Yanone Kaffeesatz', sans-serif; } - .user-details { - font-size: 13px; - h3{ - font-size:16px; - } + font-size: 13px; } - -.user-about { - background-color: #EEEEEE; - height: 200px; - line-height: 20px; - overflow: auto; - padding: 10px; - width: 90%; - p{font-size:13px;} +.user-details h3 { + font-size: 16px; } - -.follow-toggle,.submit { - border:0 !important; - color:@button-label; - font-weight:bold; - font-size:12px; - height:26px; - line-height:26px; - margin-top:-2px; - font-size:15px; - cursor:pointer; - font-family:@main-font; - background:url(../images/small-button-blue.png) repeat-x top; - .rounded-corners(4px); - .text-shadow(0px,1px,0px,#E6F6FA); - .box-shadow(1px, 1px, 2px, #808080) +.user-about { + background-color: #EEEEEE; + height: 200px; + line-height: 20px; + overflow: auto; + padding: 10px; + width: 90%; +} +.user-about p { + font-size: 13px; +} +.follow-toggle, .submit { + border: 0 !important; + color: #4a757f; + font-weight: bold; + font-size: 12px; + height: 26px; + line-height: 26px; + margin-top: -2px; + font-size: 15px; + cursor: pointer; + font-family: 'Yanone Kaffeesatz', sans-serif; + background: url(../images/small-button-blue.png) repeat-x top; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; } - .follow-toggle:hover, .submit:hover { - background:url(../images/small-button-blue.png) repeat-x bottom; - text-decoration:none !important; + background: url(../images/small-button-blue.png) repeat-x bottom; + text-decoration: none !important; } - -.follow-toggle .follow{ - font-color: #000; - font-style:normal; +.follow-toggle .follow { + font-color: #000; + font-style: normal; } - -.follow-toggle .unfollow div.unfollow-red{ - display:none; +.follow-toggle .unfollow div.unfollow-red { + display: none; } - -.follow-toggle .unfollow:hover div.unfollow-red{ - display:inline; - color:#fff; - font-weight:bold; - color:#A05736; +.follow-toggle .unfollow:hover div.unfollow-red { + display: inline; + color: #fff; + font-weight: bold; + color: #A05736; } - -.follow-toggle .unfollow:hover div.unfollow-green{ - display:none; +.follow-toggle .unfollow:hover div.unfollow-green { + display: none; } - .count { - font-family: @main-font; - font-size: 200%; - font-weight: 700; - color: #777 + font-family: 'Yanone Kaffeesatz', sans-serif; + font-size: 200%; + font-weight: 700; + color: #777777; } - .scoreNumber { - font-family: @main-font; - font-size: 35px; - font-weight: 800; - color: #777; - line-height: 40px; /*letter-spacing:0px*/ - margin-top: 3px; -} + font-family: 'Yanone Kaffeesatz', sans-serif; + font-size: 35px; + font-weight: 800; + color: #777; + line-height: 40px; + /*letter-spacing:0px*/ + margin-top: 3px; +} .vote-count { - font-family: Arial; - font-size: 160%; - font-weight: 700; - color: #777; + font-family: Arial; + font-size: 160%; + font-weight: 700; + color: #777; } - .answer-summary { - display: block; - clear: both; - padding: 3px; + display: block; + clear: both; + padding: 3px; } - .answer-votes { - background-color: #EEEEEE; - color: #555555; - float: left; - font-family: Arial; - font-size: 15px; - font-weight: bold; - height: 17px; - padding: 2px 4px 5px; - text-align: center; - text-decoration: none; - width: 20px; - margin-right: 10px; - .rounded-corners(4px); + background-color: #EEEEEE; + color: #555555; + float: left; + font-family: Arial; + font-size: 15px; + font-weight: bold; + height: 17px; + padding: 2px 4px 5px; + text-align: center; + text-decoration: none; + width: 20px; + margin-right: 10px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; } - .karma-summary { - padding:5px; - font-size:13px; + padding: 5px; + font-size: 13px; } - .karma-summary h3 { - text-align: center; - font-weight: bold; - padding:5px; + text-align: center; + font-weight: bold; + padding: 5px; } - .karma-diagram { - width:477px; - height:300px; - float:left; - margin-right:10px; + width: 477px; + height: 300px; + float: left; + margin-right: 10px; } - .karma-details { - float:right; - width:450px; - height:250px; - overflow-y:auto; - word-wrap:break-word; - p{margin-bottom:10px;} + float: right; + width: 450px; + height: 250px; + overflow-y: auto; + word-wrap: break-word; +} +.karma-details p { + margin-bottom: 10px; } - .karma-gained { - font-weight:bold; - background:#eee; - width:25px; - margin-right:5px; - color:green; - padding:3px; - display:block; - float:left; - text-align:center; - .rounded-corners(3px); + font-weight: bold; + background: #eee; + width: 25px; + margin-right: 5px; + color: green; + padding: 3px; + display: block; + float: left; + text-align: center; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } - .karma-lost { - font-weight:bold; - background:#eee; - width:25px; - color:red; - padding:3px; - display:block; - margin-right:5px; - float:left; - text-align:center; - .rounded-corners(3px); + font-weight: bold; + background: #eee; + width: 25px; + color: red; + padding: 3px; + display: block; + margin-right: 5px; + float: left; + text-align: center; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } - -.submit-row{ - margin-bottom:10px; +.submit-row { + margin-bottom: 10px; } - /*----- Revision pages ----- */ - .revision { - margin: 10px 0 10px 0; - font-size: 13px; - color:@info-text-dark; - - p{ - font-size:13px; - line-height:1.3; - color:@info-text-dark; - } - - h3{ - font-family:@main-font; - font-size:21px; - padding-left:0px; - } - - .header { - background-color: #F5F5F5; - padding: 5px; - cursor: pointer; - } - - .author { - background-color: #e9f3f5; - } - - .summary { - padding: 5px 0 10px 0; - } - - .summary span { - background-color:#fde785; - padding:6px; - .rounded-corners(4px); - display: inline; - .box-shadow(1px, 1px, 4px, #cfb852); - } - - .answerbody { - padding: 10px 0 5px 10px; - } - - .revision-mark { - width: 150px; - text-align: left; - display: inline-block; - font-size: 11px; - overflow: hidden; - - .gravatar{ - float:left; - margin-right:4px; - padding-top:5px; - } - } - - .revision-number { - font-size: 300%; - font-weight: bold; - font-family: sans-serif; - } + margin: 10px 0 10px 0; + font-size: 13px; + color: #525252; +} +.revision p { + font-size: 13px; + line-height: 1.3; + color: #525252; +} +.revision h3 { + font-family: 'Yanone Kaffeesatz', sans-serif; + font-size: 21px; + padding-left: 0px; +} +.revision .header { + background-color: #F5F5F5; + padding: 5px; + cursor: pointer; +} +.revision .author { + background-color: #e9f3f5; +} +.revision .summary { + padding: 5px 0 10px 0; +} +.revision .summary span { + background-color: #fde785; + padding: 6px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + display: inline; + -webkit-box-shadow: 1px 1px 4px #cfb852; + -moz-box-shadow: 1px 1px 4px #cfb852; + box-shadow: 1px 1px 4px #cfb852; +} +.revision .answerbody { + padding: 10px 0 5px 10px; +} +.revision .revision-mark { + width: 150px; + text-align: left; + display: inline-block; + font-size: 11px; + overflow: hidden; +} +.revision .revision-mark .gravatar { + float: left; + margin-right: 4px; + padding-top: 5px; +} +.revision .revision-number { + font-size: 300%; + font-weight: bold; + font-family: sans-serif; } - del, del .post-tag { - color: #C34719; + color: #C34719; } - ins .post-tag, ins p, ins { - background-color: #E6F0A2; + background-color: #E6F0A2; } - /* ----- Red Popup notification ----- */ - .vote-notification { - z-index: 1; - cursor: pointer; - display: none; - position: absolute; - font-family:@secondary-font; - font-size:14px; - font-weight:normal; - color: white; - background-color: #8e0000; - text-align: center; - padding-bottom:10px; - .box-shadow(0px, 2px, 4px, #370000); - .rounded-corners(4px); - - h3{ - background:url(../images/notification.png) repeat-x top; - padding:10px 10px 10px 10px; - font-size:13px; - margin-bottom:5px; - border-top:#8e0000 1px solid; - color:#fff; - font-weight:normal; - .rounded-corners-top(4px); - } - a { - color: #fb7321; - text-decoration: underline; - font-weight:bold; - } - + z-index: 1; + cursor: pointer; + display: none; + position: absolute; + font-family: Arial; + font-size: 14px; + font-weight: normal; + color: white; + background-color: #8e0000; + text-align: center; + padding-bottom: 10px; + -webkit-box-shadow: 0px 2px 4px #370000; + -moz-box-shadow: 0px 2px 4px #370000; + box-shadow: 0px 2px 4px #370000; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; +} +.vote-notification h3 { + background: url(../images/notification.png) repeat-x top; + padding: 10px 10px 10px 10px; + font-size: 13px; + margin-bottom: 5px; + border-top: #8e0000 1px solid; + color: #fff; + font-weight: normal; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; +} +.vote-notification a { + color: #fb7321; + text-decoration: underline; + font-weight: bold; } - - /* ----- Footer links , check blocks/footer.html----- */ - #ground { - width: 100%; - clear: both; - border-top: 1px solid #000; - padding: 6px 0 0 0; - background: @header-color; - font-size:16px; - font-family:@main-font; - - p { - margin-bottom:0; - } + width: 100%; + clear: both; + border-top: 1px solid #000; + padding: 6px 0 0 0; + background: #16160f; + font-size: 16px; + font-family: 'Yanone Kaffeesatz', sans-serif; +} +#ground p { + margin-bottom: 0; } - .footer-links { - color: #EEE; - text-align:left; - width:500px; - float:left; - a { - color: #e7e8a8; - } + color: #EEE; + text-align: left; + width: 500px; + float: left; } - -.powered-link{ - width:500px; - float:left; - text-align:left; - a{ - color:#8ebcc7; - } +.footer-links a { + color: #e7e8a8; } - -.copyright{ - color:#616161; - width:450px; - float:right; - text-align:right; - - a{ - color:#8ebcc7; - } - img.license-logo { - margin: 6px 0px 20px 10px; - float:right; - } +.powered-link { + width: 500px; + float: left; + text-align: left; +} +.powered-link a { + color: #8ebcc7; +} +.copyright { + color: #616161; + width: 450px; + float: right; + text-align: right; +} +.copyright a { + color: #8ebcc7; +} +.copyright img.license-logo { + margin: 6px 0px 20px 10px; + float: right; } - - .notify-me { - float: left; + float: left; } - - span.text-counter { - margin-right: 20px; + margin-right: 20px; } - span.form-error { - color: #990000; - font-weight: normal; - margin-left: 5px; + color: #990000; + font-weight: normal; + margin-left: 5px; } - p.form-item { - margin: 0px; + margin: 0px; } - - - - .deleted { - background: #F4E7E7 none repeat scroll 0 0; + background: #F4E7E7 none repeat scroll 0 0; } - - /* openid styles */ .form-row { - line-height: 25px; + line-height: 25px; } - table.form-as-table { - margin-top: 5px; + margin-top: 5px; } - table.form-as-table ul { - list-style-type: none; - display: inline; + list-style-type: none; + display: inline; } - table.form-as-table li { - display: inline; + display: inline; } - table.form-as-table td { - text-align: right; + text-align: right; } - table.form-as-table th { - text-align: left; - font-weight: normal; + text-align: left; + font-weight: normal; } - table.ab-subscr-form { - width: 45em; + width: 45em; } - table.ab-tag-filter-form { - width: 45em; + width: 45em; } - .submit-row { - line-height: 30px; - padding-top: 10px; - display: block; - clear: both; + line-height: 30px; + padding-top: 10px; + display: block; + clear: both; } - .errors { - line-height: 20px; - color: red; + line-height: 20px; + color: red; } - .error { - color: darkred; - margin: 0; - font-size: 10px; + color: darkred; + margin: 0; + font-size: 10px; } - label.retag-error { - color: darkred; - padding-left: 5px; - font-size: 10px; + color: darkred; + padding-left: 5px; + font-size: 10px; } - .fieldset { - border: none; - margin-top: 10px; - padding: 10px; + border: none; + margin-top: 10px; + padding: 10px; } - - span.form-error { - color: #990000; - font-size: 90%; - font-weight: normal; - margin-left: 5px; + color: #990000; + font-size: 90%; + font-weight: normal; + margin-left: 5px; } - - /* .favorites-count-off { color: #919191; @@ -2662,580 +2491,527 @@ span.form-error { text-align: center; } */ - /* todo: get rid of this in html */ .favorites-empty { - width: 32px; - height: 45px; - float: left; + width: 32px; + height: 45px; + float: left; } - .user-info-table { - margin-bottom: 10px; - border-spacing: 0; + margin-bottom: 10px; + border-spacing: 0; } - /* todo: remove this hack? */ .user-stats-table .narrow { - width: 660px; + width: 660px; } - .narrow .summary h3 { - padding: 0px; - margin: 0px; + padding: 0px; + margin: 0px; } - .relativetime { - font-weight: bold; - text-decoration: none; + font-weight: bold; + text-decoration: none; } - .narrow .tags { - float: left; + float: left; } - - - - /* todo: make these more semantic */ .user-action-1 { - font-weight: bold; - color: #333; + font-weight: bold; + color: #333; } - .user-action-2 { - font-weight: bold; - color: #CCC; + font-weight: bold; + color: #CCC; } - .user-action-3 { - color: #333; + color: #333; } - .user-action-4 { - color: #333; + color: #333; } - .user-action-5 { - color: darkred; + color: darkred; } - .user-action-6 { - color: darkred; + color: darkred; } - .user-action-7 { - color: #333; + color: #333; } - .user-action-8 { - padding: 3px; - font-weight: bold; - background-color: #CCC; - color: #763333; + padding: 3px; + font-weight: bold; + background-color: #CCC; + color: #763333; } - .revision-summary { - background-color: #FFFE9B; - padding: 2px; + background-color: #FFFE9B; + padding: 2px; } - .question-title-link a { - font-weight: bold; - color: #0077CC; + font-weight: bold; + color: #0077CC; } - .answer-title-link a { - color: #333; + color: #333; } - /* todo: make these more semantic */ .post-type-1 a { - font-weight: bold; - + font-weight: bold; } - .post-type-3 a { - font-weight: bold; - + font-weight: bold; } - .post-type-5 a { - font-weight: bold; + font-weight: bold; } - .post-type-2 a { - color: #333; + color: #333; } - .post-type-4 a { - color: #333; + color: #333; } - .post-type-6 a { - color: #333; + color: #333; } - .post-type-8 a { - color: #333; + color: #333; } - .hilite { - background-color: #ff0; + background-color: #ff0; } - .hilite1 { - background-color: #ff0; + background-color: #ff0; } - .hilite2 { - background-color: #f0f; + background-color: #f0f; } - .hilite3 { - background-color: #0ff; + background-color: #0ff; } - .gold, .badge1 { - color: #FFCC00; + color: #FFCC00; } - .silver, .badge2 { - color: #CCCCCC; + color: #CCCCCC; } - .bronze, .badge3 { - color: #CC9933; + color: #CC9933; } - .score { - font-weight: 800; - color: #333; + font-weight: 800; + color: #333; } - - a.comment { - background: #EEE; - color: #993300; - padding: 5px; + background: #EEE; + color: #993300; + padding: 5px; } - a.offensive { - color: #999; + color: #999; } - .message h1 { - padding-top: 0px; - font-size: 15px; + padding-top: 0px; + font-size: 15px; } - .message p { - margin-bottom: 0px; + margin-bottom: 0px; } - p.space-above { - margin-top: 10px; + margin-top: 10px; } - .warning { - color: red; + color: red; } - - - button::-moz-focus-inner { - padding:0; - border:none; + padding: 0; + border: none; } .submit { - cursor: pointer; /*letter-spacing:1px;*/ - background-color: #D4D0C8; - height: 30px; - border: 1px solid #777777; /* width:100px; */ - font-weight: bold; - font-size: 120%; -} + cursor: pointer; + /*letter-spacing:1px;*/ + + background-color: #D4D0C8; + height: 30px; + border: 1px solid #777777; + /* width:100px; */ + font-weight: bold; + font-size: 120%; +} .submit:hover { - text-decoration: underline; + text-decoration: underline; } - .submit.small { - margin-right:5px; - height:20px; - font-weight:normal; - font-size:12px; - padding:1px 5px; + margin-right: 5px; + height: 20px; + font-weight: normal; + font-size: 12px; + padding: 1px 5px; } .submit.small:hover { - text-decoration:none; + text-decoration: none; } .question-page a.submit { - display: -moz-inline-stack; - display: inline-block; - line-height: 30px; - padding: 0 5px; - *display: inline; + display: -moz-inline-stack; + display: inline-block; + line-height: 30px; + padding: 0 5px; + *display: inline; } - .noscript { - position: fixed; - top: 0px; - left: 0px; - width: 100%; - z-index: 100; - padding: 5px 0; - text-align: center; - font-family: sans-serif; - font-size: 120%; - font-weight: Bold; - color: #FFFFFF; - background-color: #AE0000; + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 5px 0; + text-align: center; + font-family: sans-serif; + font-size: 120%; + font-weight: Bold; + color: #FFFFFF; + background-color: #AE0000; } - .big { - font-size: 14px; + font-size: 14px; } - .strong { - font-weight: bold; + font-weight: bold; } +.orange { + /* used in django.po */ -.orange {/* used in django.po */ - color: #d64000; - font-weight: bold; + color: #d64000; + font-weight: bold; } - .grey { - color: #808080; + color: #808080; } - .about div { - padding: 10px 5px 10px 5px; - border-top: 1px dashed #aaaaaa; + padding: 10px 5px 10px 5px; + border-top: 1px dashed #aaaaaa; } - .highlight { - background-color: #FFF8C6; + background-color: #FFF8C6; } - .nomargin { - margin: 0; + margin: 0; } - .margin-bottom { - margin-bottom: 10px; + margin-bottom: 10px; } - .margin-top { - margin-top: 10px; + margin-top: 10px; } - .inline-block { - display: inline-block; + display: inline-block; } - .action-status { - margin: 0; - border: none; - text-align: center; - line-height: 10px; - font-size: 12px; - padding: 0; + margin: 0; + border: none; + text-align: center; + line-height: 10px; + font-size: 12px; + padding: 0; } - .action-status span { - padding: 3px 5px 3px 5px; - background-color: #fff380; /* nice yellow */ - font-weight: normal; - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; -} + padding: 3px 5px 3px 5px; + background-color: #fff380; + /* nice yellow */ + font-weight: normal; + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + -webkit-border-radius: 5px; +} .list-table td { - vertical-align: top; + vertical-align: top; } - /* these need to go */ table.form-as-table .errorlist { - display: block; - margin: 0; - padding: 0 0 0 5px; - text-align: left; - font-size: 10px; - color: darkred; + display: block; + margin: 0; + padding: 0 0 0 5px; + text-align: left; + font-size: 10px; + color: darkred; } - table.form-as-table input { - display: inline; - margin-left: 4px; + display: inline; + margin-left: 4px; } - table.form-as-table th { - vertical-align: bottom; - padding-bottom: 4px; + vertical-align: bottom; + padding-bottom: 4px; } - .form-row-vertical { - margin-top: 8px; - display: block; + margin-top: 8px; + display: block; } - .form-row-vertical label { - margin-bottom: 3px; - display: block; + margin-bottom: 3px; + display: block; } - /* above stuff needs to go */ .text-align-right { - text-align: center; + text-align: center; } - ul.form-horizontal-rows { - list-style: none; - margin: 0; + list-style: none; + margin: 0; } - ul.form-horizontal-rows li { - position: relative; - height: 40px; + position: relative; + height: 40px; } - ul.form-horizontal-rows label { - display: inline-block; + display: inline-block; } - ul.form-horizontal-rows ul.errorlist { - list-style: none; - color: darkred; - font-size: 10px; - line-height: 10px; - position: absolute; - top: 2px; - left: 180px; - text-align: left; - margin: 0; + list-style: none; + color: darkred; + font-size: 10px; + line-height: 10px; + position: absolute; + top: 2px; + left: 180px; + text-align: left; + margin: 0; } - ul.form-horizontal-rows ul.errorlist li { - height: 10px; + height: 10px; } - ul.form-horizontal-rows label { - position: absolute; - left: 0px; - bottom: 6px; - margin: 0px; - line-height: 12px; - font-size: 12px; + position: absolute; + left: 0px; + bottom: 6px; + margin: 0px; + line-height: 12px; + font-size: 12px; } - ul.form-horizontal-rows li input { - position: absolute; - bottom: 0px; - left: 180px; - margin: 0px; + position: absolute; + bottom: 0px; + left: 180px; + margin: 0px; } - .narrow .summary { - float: left; + float: left; } - .user-profile-tool-links { - font-weight: bold; - vertical-align: top; + font-weight: bold; + vertical-align: top; } - - ul.post-tags { - margin-left: 7px; + margin-left: 7px; } ul.post-tags li { - margin-top: 4px; - margin-bottom: 3px; + margin-top: 4px; + margin-bottom: 3px; } - ul.post-retag { - margin-bottom:0px; - margin-left:5px; + margin-bottom: 0px; + margin-left: 5px; } - #question-controls .tags { - margin: 0 0 3px 0; + margin: 0 0 3px 0; } - #tagSelector { - padding-bottom: 2px; - margin-bottom: 0; + padding-bottom: 2px; + margin-bottom: 0; } - #related-tags { - padding-left: 3px; + padding-left: 3px; } - #hideIgnoredTagsControl { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } - #hideIgnoredTagsControl label { - font-size: 12px; - color: #666; + font-size: 12px; + color: #666; } - #hideIgnoredTagsCb { - margin: 0 2px 0 1px; + margin: 0 2px 0 1px; } - #recaptcha_widget_div { - width: 318px; - float: left; - clear: both; + width: 318px; + float: left; + clear: both; } - p.signup_p { - margin: 20px 0px 0px 0px; + margin: 20px 0px 0px 0px; } - .simple-subscribe-options ul { - list-style: none; - list-style-position: outside; - margin: 0; + list-style: none; + list-style-position: outside; + margin: 0; } - /* a workaround to set link colors correctly */ - .wmd-preview a { - color:@link; + color: #1b79bd; } - .wmd-preview li { - margin-bottom:7px; - font-size:14px; + margin-bottom: 7px; + font-size: 14px; } - .search-result-summary { - font-weight: bold; - font-size:18px; - line-height:22px; - margin:0px 0px 0px 0px; - padding:2px 0 0 0; - float: left; + font-weight: bold; + font-size: 18px; + line-height: 22px; + margin: 0px 0px 0px 0px; + padding: 2px 0 0 0; + float: left; } - -.faq-rep-item { - text-align:right; - padding-right:5px; +.faq-rep-item { + text-align: right; + padding-right: 5px; } - - .user-info-table .gravatar { - margin:0; + margin: 0; } - #responses { - clear:both; - line-height:18px; - margin-bottom:15px; + clear: both; + line-height: 18px; + margin-bottom: 15px; } - #responses div.face { - float:left; - text-align: center; - width: 54px; - padding: 3px; - overflow:hidden; + float: left; + text-align: center; + width: 54px; + padding: 3px; + overflow: hidden; } - .response-parent { - margin-top: 18px; + margin-top: 18px; } - -.response-parent strong{ - font-size: 20px; +.response-parent strong { + font-size: 20px; } - .re { - min-height: 57px; - clear: both; - margin-top: 10px; + min-height: 57px; + clear: both; + margin-top: 10px; } - #responses input { - float:left; + float: left; } #re_tools { - margin-bottom:10px; + margin-bottom: 10px; } #re_sections { - margin-bottom:6px; + margin-bottom: 6px; } #re_sections .on { - font-weight:bold; + font-weight: bold; } - .avatar-page ul { - list-style: none; + list-style: none; } .avatar-page li { - display: inline; + display: inline; } .user-profile-page .avatar p { - margin-bottom: 0px; + margin-bottom: 0px; } .user-profile-page .tabBar a#stats { - margin-left: 0; + margin-left: 0; } .user-profile-page img.gravatar { - margin: 2px 0 3px 0; + margin: 2px 0 3px 0; } .user-profile-page h3 { - padding: 0; - margin-top: -3px; + padding: 0; + margin-top: -3px; } .userList { - font-size: 13px; + font-size: 13px; } - img.flag { - border: 1px solid #eee; - vertical-align: text-top; + border: 1px solid #eee; + vertical-align: text-top; } - .main-page img.flag { - vertical-align: text-bottom; + vertical-align: text-bottom; } - - /* Pretty printing styles. Used with prettify.js. */ - a.edit { - padding-left:3px; - color: #145bff; + padding-left: 3px; + color: #145bff; +} +.str { + color: #080; +} +.kwd { + color: #008; +} +.com { + color: #800; +} +.typ { + color: #606; +} +.lit { + color: #066; +} +.pun { + color: #660; +} +.pln { + color: #000; +} +.tag { + color: #008; +} +/* name conflict here */ +.atn { + color: #606; +} +.atv { + color: #080; +} +.dec { + color: #606; +} +pre.prettyprint { + padding: 3px; + border: 0px solid #888; } - -.str { color: #080; } -.kwd { color: #008; } -.com { color: #800; } -.typ { color: #606; } -.lit { color: #066; } -.pun { color: #660; } -.pln { color: #000; } -.tag { color: #008; }/* name conflict here */ -.atn { color: #606; } -.atv { color: #080; } -.dec { color: #606; } -pre.prettyprint { padding: 3px; border: 0px solid #888; } - @media print { - .str { color: #060; } - .kwd { color: #006; font-weight: bold; } - .com { color: #600; font-style: italic; } - .typ { color: #404; font-weight: bold; } - .lit { color: #044; } - .pun { color: #440; } - .pln { color: #000; } - .tag { color: #006; font-weight: bold; } - .atn { color: #404; } - .atv { color: #060; } + .str { + color: #060; + } + .kwd { + color: #006; + font-weight: bold; + } + .com { + color: #600; + font-style: italic; + } + .typ { + color: #404; + font-weight: bold; + } + .lit { + color: #044; + } + .pun { + color: #440; + } + .pln { + color: #000; + } + .tag { + color: #006; + font-weight: bold; + } + .atn { + color: #404; + } + .atv { + color: #060; + } } diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less new file mode 100644 index 00000000..c2d366dd --- /dev/null +++ b/askbot/skins/default/media/style/style.less @@ -0,0 +1,3257 @@ +@import url(jquery.autocomplete.css); +@import "lib_style.less"; /* Library of predifined less functions styles */ + +/* ----- General HTML Styles----- */ + +body { + background: #FFF; + font-size: 14px; + line-height: 150%; + margin: 0; + padding: 0; + color: #000; + font-family:@body-font; +} + +div { + margin: 0 auto; + padding: 0; +} + +h1, h2, h3, h4, h5, h6, ul, li, dl, dt, dd, form, img, p { + margin: 0; + padding: 0; + border: none; +} + +label { + vertical-align: middle; +} + +hr { + border: none; + border-top: 1px dashed #ccccce; +} + +input, select { + vertical-align: middle; + font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif; + margin-left:0px; +} + +p { + font-size: 14px; + line-height: 140%; + margin-bottom: 6px; +} + +a { + color:@link; + text-decoration: none; + cursor: pointer; +} + +h2 { + font-size: 21px; + padding: 3px 0 3px 5px; +} + +h3 { + font-size: 19px; + padding: 3px 0 3px 5px; +} + +ul { + list-style: disc; + margin-left: 20px; + padding-left: 0px; + margin-bottom: 1em; +} + +ol { + list-style: decimal; + margin-left: 30px; + margin-bottom: 1em; + padding-left: 0px; +} + +td ul { + vertical-align: middle; +} + +li input { + margin: 3px 3px 4px 3px; +} + +pre { + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; + margin-bottom: 10px; + /*overflow: auto;*/ + background-color: #F5F5F5; + padding-left: 5px; + padding-top: 5px; + /*width: 671px;*/ + padding-bottom: 20px ! ie7; +} + +code { + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; + +} + +blockquote { + margin-bottom: 10px; + margin-right: 15px; + padding: 10px 0px 1px 10px; + background-color: #F5F5F5; +} + +/* http://pathfindersoftware.com/2007/09/developers-note-2/ */ +* html .clearfix, +* html .paginator { + height: 1; + overflow: visible; +} ++ html .clearfix, ++ html .paginator { + min-height: 1%; +} +.clearfix:after, +.paginator:after { + clear: both; + content:"."; + display:block; + height: 0; + visibility: hidden; +} + +.badges a { + color: #763333; + text-decoration: underline; +} + +a:hover { + text-decoration: underline; +} + +.badge-context-toggle.active { + cursor: pointer; + text-decoration: underline; +} + +h1 { + font-size: 24px; + padding: 10px 0 5px 0px; +} + +/* ----- Extra space above for messages ----- */ + +body.user-messages { + margin-top: 2.4em; +} + +/* ----- Custom positions ----- */ + +.left{float:left} +.right{float:right} +.clean{clear:both} +.center{ + margin: 0 auto; + padding: 0; +} + + +/* ----- Notify message bar , check blocks/system_messages.html ----- */ + +.notify { + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 0; + text-align: center; + background-color: #f5dd69; + border-top:#fff 1px solid; + font-family:@main-font; + + p { + margin-top: 6px; + margin-bottom: 6px; + font-size: 16px; + color:#424242 + } +} + +#closeNotify { + position: absolute; + right: 5px; + top: 7px; + color: #735005; + text-decoration: none; + line-height: 18px; + .sprites(-6px,-5px); + cursor: pointer; + width:20px; + height:20px; +} + +#closeNotify:hover { + .sprites(-26px,-5px); +} + +/* ----- Header, check blocks/header.html ----- */ + +#header { + margin-top: 0px; + background: @header-color; + font-family:@main-font; +} + +.content-wrapper {/* wrapper positioning class */ + width: 960px; + margin: auto; + position:relative; +} + +#logo img{ + padding: 5px 0px 5px 0px; + height: 75px; + width: auto; +} + +#userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ + height: 20px; + position:absolute; + bottom: 0; + right:0px; + padding-bottom:5px; + + a { + height: 35px; + text-align: right; + margin-left: 20px; + text-decoration: underline; + color:#d0e296; + font-size:16px; + } + + a:first-child { + margin-left: 0; + } + + a#ab-responses { + margin-left: 3px; + } + + .user-info,.user-micro-info{ + color:#b5b593; + } + + a img { + vertical-align:middle; + margin-bottom:2px; + } + + .user-info a { + margin: 0; + text-decoration: none; + } +} + +#metaNav {/* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */ + float:right; + + a { + color: #e2e2ae; + padding: 0px 0px 0px 35px; + height: 25px; + line-height: 30px; + margin:5px 0px 0px 10px; + font-size: 18px; + font-weight: 100; + text-decoration: none; + display: block; + float: left; + } + + a:hover { + text-decoration: underline; + } + + a.on { + font-weight:bold; + color: #FFF; + text-decoration: none; + } + + a.special { + font-size: 18px; + color: #B02B2C; + font-weight: bold; + text-decoration: none; + } + + a.special:hover { + text-decoration: underline; + } + + #navTags{ + .sprites(-50px,-5px) + } + + #navUsers{ + .sprites(-125px,-5px) + } + + #navBadges{ + .sprites(-210px,-5px) + } +} + +#secondaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */ + height:55px; + background:#e9e9e1; + border-bottom:#d3d3c2 1px solid; + border-top:#fcfcfc 1px solid; + margin-bottom:10px; + font-family:@main-font; + + #homeButton{ + border-right:#afaf9e 1px solid; + .sprites(-6px,-36px); + height:55px; + width:43px; + display:block; + float:left; + } + + #homeButton:hover{ + .sprites(-6px-45,-36px); + } + + #scopeWrapper{ + width:688px; + float:left; + + a{ + display:block; + float:left; + } + + .scope-selector{ + font-size:21px; + color:#5a5a4b; + height:55px; + line-height:55px; + margin-left:24px + } + .on{ + background:url(../images/scopearrow.png) no-repeat center bottom; + } + + .ask-message{ + font-size:24px; + } + } +} + +#searchBar { /* Main search form , check widgets/search_bar.html */ + display:inline-block; + background-color: #fff; + width:412px; + border: 1px solid #c9c9b5; + float:right; + height:42px; + margin:6px 0px 0px 15px; + + .searchInput, .searchInputCancelable, + .searchInputAuth, .searchInputCancelableAuth { + font-size: 30px; + height: 40px; + font-weight:300; + background:#FFF; + border:0px; + color:#484848; + padding-left:10px; + font-family:@body-font; + vertical-align: middle; + } + + .searchInput, .searchInputCancelable { + width: 352px; + } + + .searchInputCancelable { + width: 317px; + } + + .searchInputAuth{ + width: 340px; + } + + .searchInputCancelableAuth { + width: 310px; /*FIXME byron */ + } + + .logoutsearch { + width: 337px; + } + + .searchBtn { + font-size: 10px; + color: #666; + background-color: #eee; + height: 42px; + border:#FFF 1px solid; + line-height: 22px; + text-align: center; + float:right; + margin: 0px; + width:48px; + .sprites(-98px,-36px); + cursor:pointer; + } + + .searchBtn:hover { + .sprites(-98px-48,-36px); + } + + .cancelSearchBtn { + font-size: 30px; + color: #ce8888; + background:#fff; + height: 42px; + border:0px; + border-left:#deded0 1px solid; + text-align: center; + width: 35px; + cursor:pointer; + } + + .cancelSearchBtn:hover { + color: #d84040; + } +} + +#askButton{ /* check blocks/secondary_header.html and widgets/ask_button.html*/ + background: url(../images/bigbutton.png) repeat-x bottom; + line-height:44px; + text-align:center; + width:200px; + height:42px; + font-size:23px; + color:@button-label; + margin-top:7px; + float:right; + text-transform:uppercase; + .rounded-corners(5px); + .box-shadow(1px, 1px, 2px, #636363) +} + +#askButton:hover{ + text-decoration:none; + background: url(../images/bigbutton.png) repeat-x top; + .text-shadow(0px, 1px, 0px, #c6d9dd) +} + +/* ----- Content layout, check two_column_body.html or one_column_body.html ----- */ + +#ContentLeft { + width: 730px; + float: left; + position: relative; + padding-bottom:10px; +} + +#ContentRight { + width: 200px; + float: right; + padding: 0 0px 10px 0px; +} + +#ContentFull { + float: left; + width: 960px; +} + +/* ----- Sidebar Widgets Box, check main_page/sidebar.html or question/sidebar.html ----- */ + +.box { + background: #fff; + padding: 4px 0px 10px 0px; + width:200px; + + p { + margin-bottom: 4px; + } + + p.info-box-follow-up-links { + text-align: right; + margin: 0; + } + + h2 { + padding-left: 0; + background:#eceeeb; + height:30px; + line-height:30px; + text-align:right; + font-size:18px !important; + font-weight:normal; + color:#656565; + padding-right:10px; + margin-bottom:10px; + font-family:@main-font; + } + h3{ + color:#4a757f; + font-size:18px; + text-align:left; + font-weight:normal; + font-family:@main-font; + } + .contributorback{ + background: #eceeeb url(../images/contributorsback.png) no-repeat center left; + } + + label { + color: @info-text; + font-size:15px; + display: block; + float: right; + width: 177px; + font-family:@main-font; + } + + ul { + margin-left: 22px; + } + + li { + list-style-type: disc; + font-size: 13px; + line-height: 20px; + margin-bottom: 10px; + color:@info-text; + } + ul.tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; + } + #displayTagFilterControl p label{ + color:@info-text; + font-size:15px; + } + + .inputs{ + #interestingTagInput, #ignoredTagInput{ + width:158px; + border:#c9c9b5 1px solid; + height:25px; + } + #interestingTagAdd, #ignoredTagAdd{ + background:url(../images/small-button-blue.png) repeat-x top; + border:0; + color:@button-label; + font-weight:bold; + font-size:12px; + width:30px; + height:27px; + margin-top:-2px; + cursor:pointer; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080); + + + } + #interestingTagAdd:hover, #ignoredTagAdd:hover{ + background:url(../images/small-button-blue.png) repeat-x bottom; + } + } + + img.gravatar { + margin:1px; + } + +/* widgets for question template */ + + a.followed, a.follow{ + background: url(../images/medium-button.png) top repeat-x; + height:34px; + line-height:34px; + text-align:center; + border:0; + font-family:@main-font; + color:@button-label; + font-weight:normal; + font-size:21px; + margin-top:3px; + display:block; + width:120px; + text-decoration:none; + .rounded-corners(4px); + .box-shadow(1px, 1px, 2px, #636363); + .center; + } + + a.followed:hover, a.follow:hover{ + text-decoration:none; + background: url(../images/medium-button.png) bottom repeat-x; + .text-shadow(0px, 1px, 0px, #c6d9dd); + } + + a.followed div.unfollow{ + display:none; + } + + a.followed:hover div{ + display:none; + } + a.followed:hover div.unfollow{ + display:inline; + color:#a05736; + } + + .favorite-number { + padding: 5px 0 0 5px; + font-size: 100%; + font-family: Arial; + font-weight: bold; + color: #777; + text-align:center; + } +} + +.statsWidget p{ + color:@info-text; + font-size:16px; + border-bottom:#cccccc 1px solid; + font-size:13px; + + strong{ + float:right; + padding-right:10px; + } +} +.questions-related { + word-wrap: break-word; + + p { + line-height: 20px; + padding: 4px 0px 4px 0px; + font-size: 16px; + font-weight:normal; + border-bottom:#cccccc 1px solid; + } + a{ + font-size:13px; + } +} +/* tips and markdown help are widgets for ask template */ + +#tips{ + li{ + color:@info-text; + font-size:13px; + list-style-image: url(../images/tips.png); + } + a{ + font-size:16px; + } +} + +#markdownHelp{ + li{ + color:@info-text; + font-size:13px; + } + a{ + font-size:16px; + } +} + + +/* ----- Sorting top Tab, check main_page/tab_bar.html ------*/ + +.tabBar { + background-color: #eff5f6; + height: 30px; + margin-bottom: 3px; + margin-top: 3px; + float:right; + font-family:@sort-font; + font-size:16px; + .rounded-corners(5px); +} + +.tabBar h2 { + float: left; +} + +.tabsA, .tabsC { + float: right; + position: relative; + display: block; + height: 20px; +} + +/* tabsA - used for sorting */ +.tabsA { float: right; } +.tabsC { float: left; } + +.tabsA a, .tabsC a{ + + border-left: 1px solid #d0e1e4; + color: @section-title; + display: block; + float: left; + height: 20px; + line-height: 20px; + padding:4px 7px 4px 7px; + text-decoration: none; +} + +.tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover { + color: @button-label; +} + +.tabsA a.rev.on, tabsA a.rev.on:hover { +} + +.tabsA .label, .tabsC .label { + float: left; + color: #646464; + margin-top:4px; + margin-right:5px; +} + +.tabsB a { + background: #eee; + border: 1px solid #eee; + color: #777; + display: block; + float: left; + height: 22px; + line-height: 28px; + margin: 5px 0px 0 4px; + padding: 0 11px 0 11px; + text-decoration: none; +} + +.rss { + float: right; + font-size: 16px; + color: #f57900; + margin: 5px 0px 3px 7px; + width:52px; + padding-left: 16px; + padding-top:3px; + background:#fff url(../images/feed-icon-small.png) no-repeat center right; + float:right; + font-family:@sort-font; + font-size:16px; +} + +.rss:hover { + color: #F4A731 !important; +} + +/* ----- Headline, containing number of questions and tags selected, check main_page/headline.html ----- */ + +#questionCount{ + font-weight:bold; + font-size:23px; + color:@section-title; + width:200px; + float:left; + margin-bottom:8px; + padding-top:6px; + font-family:@main-font; +} + +#listSearchTags{ + float:left; + margin-top:3px; + color:@info-text; + font-size:16px; + font-family:@main-font; +} + +ul#searchTags { + margin-left:10px; + float:right; + padding-top:2px; +} + +.search-tips { + font-size:16px; + line-height:17px; + color: @info-text; + margin:5px 0 10px 0; + padding:0px; + float:left; + font-family:@main-font; + + a { + text-decoration: underline; + color: @link; + } +} + +/* ----- Question list , check main_page/content.html and macros/macros.html----- */ + +#question-list { + float: left; + position: relative; + background-color: #FFF; + padding: 0; + width: 100%; +} + +.short-summary { + position: relative; + filter: inherit; + padding: 10px; + border-bottom: 1px solid #DDDBCE; + margin-bottom:1px; + overflow: hidden; + width: 710px; + float: left; + background: url(../images/summary-background.png) repeat-x; + + h2 { + font-size: 24px; + font-weight:normal; + line-height: 26px; + padding-left: 0; + margin-bottom:8px; + display:block; + font-family:@main-font; + } + + a { + color:@question-link; + } + + .userinfo { + text-align:right; + line-height:16px; + font-family:@body-font; + padding-right:4px; + } + + + .userinfo .relativetime, span.anonymous + { + font-size: 11px; + clear:both; + font-weight: normal; + color: #555; + } + + .userinfo a{ + font-weight:bold; + font-size:11px; + } + + .counts { + float: right; + margin: 4px 0 0 5px; + font-family:@main-font; + } + + .counts .item-count { + padding:0px 5px 0px 5px; + font-size: 25px; + font-family:@main-font; + } + + .counts .votes div, + .counts .views div, + .counts .answers div, + .counts .favorites div + { + margin-top:3px; + font-size: 14px; + line-height:14px; + color: #646464; + } + + .tags { + margin-top: 0; + } + + .votes, .answers, .favorites, .views { + text-align: center; + margin: 0 3px; + padding: 8px 2px 0px 2px; + width: 51px; + float: right; + height:44px; + border:#dbdbd4 1px solid; + } + + .votes{ + background: url(../images/vote-background.png) repeat-x; + } + + .answers{ + background:url(../images/answers-background.png) repeat-x; + } + + .views { + background:url(../images/view-background.png) repeat-x; + } + + .no-votes .item-count { + color: #b1b5b6; + } + .some-votes .item-count { + color: #4a757f; + } + + .no-answers .item-count { + color: #b1b5b6; + } + .some-answers .item-count { + color: #eab243; + } + + .no-views .item-count { + color: #b1b5b6; + } + .some-views .item-count { + color: #d33f00; + } + + .accepted .item-count { + background:url(../images/accept.png) no-repeat top right; + display: block; + text-align: center; + width: 40px; + color: #eab243; + } + + .some-favorites .item-count { + background:#338333; + color:#d0f5a9; + } + .no-favorites .item-count { + background: #eab243; + color: yellow; + } + +} + +/* ----- Question list Paginator , check main_content/pager.html and macros/utils_macros.html----- */ + +.evenMore { + font-size: 13px; + color:@info-text; + padding:15px 0px 10px 0px; + clear:both; +} + +.evenMore a { + text-decoration: underline; + color:@link; +} + +.pager { + margin-top: 10px; + margin-bottom: 16px; +} + +.pagesize { + margin-top: 10px; + margin-bottom: 16px; + float: right; +} + +.paginator { + padding: 5px 0 10px 0; + font-size:13px; + + .prev a, .prev a:visited, + .next a, .next a:visited { + background-color: #fff; + color: #777; + padding: 2px 4px 3px 4px; + } + a{ + color:@section-title; + } + .prev { + margin-right: .5em; + } + + .next { + margin-left: .5em; + } + + .page a, .page a:visited, .curr { + padding: .25em; + background-color: #fff; + margin: 0em .25em; + color: #ff; + } + + .curr { + background-color: #8ebcc7; + color: #fff; + font-weight: bold; + } + .next a, .prev a{ + color:@section-title + } + .page a:hover, + .curr a:hover, + .prev a:hover, + .next a:hover { + color: #8C8C8C; + background-color: #E1E1E1; + text-decoration: none; + } + + .text { + color: #777; + padding: .3em; + } + + .paginator-container-left { + padding: 5px 0 10px 0; + } + +} + +/* ----- Tags Styles ----- */ + +/* tag formatting is also copy-pasted in template + because it must be the same in the emails + askbot/models/__init__.py:format_instant_notification_email() +*/ + +/* tag cloud */ + +.tag-size-1 { + font-size:12px; +} +.tag-size-2 { + font-size:13px; +} +.tag-size-3 { + font-size:14px; +} +.tag-size-4 { + font-size:15px; +} +.tag-size-5 { + font-size:16px; +} +.tag-size-6 { + font-size:17px; +} +.tag-size-7 { + font-size:18px; +} +.tag-size-8 { + font-size:19px; +} +.tag-size-9 { + font-size:20px; +} +.tag-size-10 { + font-size:21px; +} + +ul.tags, +ul.tags.marked-tags, +ul#related-tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; +} + +ul.tags li { + float:left; + display: block; + margin: 0 5px 0 0; + padding: 0; + height:20px; +} + +.wildcard-tags { + clear: both; +} + +ul.tags.marked-tags li, +.wildcard-tags ul.tags li { + margin-bottom: 5px; +} + +#tagSelector div.inputs { + clear: both; + float: none; + margin-bottom:10px; +} + +.tags-page ul.tags li, +ul#ab-user-tags li { + width: 160px; + margin:5px; +} + +ul#related-tags li { + margin: 0 5px 5px 0; + float: left; + clear: left; +} + +/* .tag-left and .tag-right are for the sliding doors decoration of tags */ + +.tag-left { + background: url(../images/tag-right.png) no-repeat right center; + border: none; + cursor: pointer; + display: block; + float: left; + height: 20px; + margin: 0 5px 0 0; + padding: 0; +} + +.tag-right { + background:url(../images/tag-left.png) no-repeat left center; + border: none; + display: block; + float: left; + height: 20px; + line-height: 20px; + font-weight: normal; + font-size: 11px; + padding: 0px 10px 0px 15px; + text-decoration: none; + text-align: center; + white-space: nowrap; + vertical-align: middle; + font-family:@body-font; + color:#717179; +} +.deletable-tag { + margin-right: 3px; + white-space: nowrap; +} + +.deletable-tag .tag-right { + padding-right: 0px; + float: left; +} +.deletable-tag.tag-left { + padding-right: 0px; +} + +.tags a.tag-right, +.tags span.tag-right { + color: #585858; + text-decoration: none; + +} +.tags a:hover{ + color: #1A1A1A; +} + +.users-page h1, .tags-page h1 { + float: left; +} + +.main-page h1 { + margin-right: 5px; +} + +span.delete-icon { + padding-left: 13px; + vertical-align: bottom; + background: url(../images/close-small-dark.png) bottom no-repeat; + cursor: default; +} +span.delete-icon:hover { + background: url(../images/close-small-dark.png) top no-repeat; +} + +.tags span.delete-icon { + float: left; + height: 20px; + width:8px; + margin: 0px 0 0 10px; + display: block; +} + +.tag-number { + font-weight: normal; + float: left; + font-size:16px; + color:#5d5d5d; +} + +.badges .tag-number { + float: none; + display: inline; + padding-right: 15px; +} + +/* ----- Ask and Edit Question Form template----- */ + +.section-title{ + color:@section-title; + font-family:@main-font; + font-weight:bold; + font-size:24px; +} + +.ask-body { + padding-right: 10px; +} + +#fmask{ + margin-bottom:30px; + width:100%; +} + +#askFormBar { + display:inline-block; + padding: 4px 7px 5px 0px; + margin-top:0px; + + p{ + margin:0 0 5px 0; + font-size:14px; + color:@info-text-dark; + line-height:1.4; + } + .questionTitleInput { + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border:#cce6ec 3px solid; + width:725px; + } +} + +.ask-page, .edit-question-page{ + + div#question-list { + float: none; + border-bottom:#f0f0ec 1px solid; + float:left; + margin-bottom:10px; + a{ + line-height:30px; + } + + } + + div#question-list h2 { + font-size: 13px; + padding-bottom: 0; + color:@link; + border-top:#f0f0ec 1px solid; + border-left:#f0f0ec 1px solid; + height:30px; + line-height:30px; + font-weight:normal; + } + + div#question-list span { + width:28px; + height:26px; + line-height:26px; + text-align:center; + margin-right: 10px; + float:left; + display:block; + color:#fff; + background: #b8d0d5; + .rounded-corners(3px); + } + label{ + color:@info-text-dark; + font-size:13px; + } + + #id_tags{ + border:#cce6ec 3px solid; + height:25px; + padding-left:5px; + width:395px; + font-size:14px; + } +} + +.title-desc { + color: @info-text; + font-size: 13px; +} + +#fmanswer input.submit, +.ask-page input.submit, +.edit-question-page input.submit { + float: left; + background: url(../images/medium-button.png) top repeat-x; + height:34px; + border:0; + font-family:@main-font; + color:@button-label; + font-weight:normal; + font-size:21px; + margin-top:3px; + .rounded-corners(4px); + .box-shadow(1px, 1px, 2px, #636363); + margin-right:7px; +} + +#fmanswer input.submit:hover, +.ask-page input.submit:hover, +.edit-question-page input.submit:hover{ + text-decoration:none; + background: url(../images/medium-button.png) bottom repeat-x; + .text-shadow(0px, 1px, 0px, #c6d9dd) +} +#editor { /*adjustment for editor preview*/ + font-size: 100%; + min-height: 200px; + line-height: 18px; + margin:0; + border-left:#cce6ec 3px solid; + border-bottom:#cce6ec 3px solid; + border-right:#cce6ec 3px solid; + border-top:0; + padding:10px; + margin-bottom:10px; + width:710px; +} + +#id_title { + width: 100%; +} + +.wmd-preview { + margin: 3px 0 5px 0; + padding: 6px; + background-color: #F5F5F5; + min-height: 20px; + overflow: auto; + font-size:13px; + font-family:@body-font; + + p{ + margin-bottom:14px; + line-height:1.4; + font-size:14px; + } +} + +.wmd-preview pre { + background-color: #E7F1F8; + +} + +.wmd-preview blockquote { + background-color: #eee; +} + +.wmd-preview IMG { + max-width: 600px; +} + +.preview-toggle { + width: 100%; + color: #b6a475; /*letter-spacing:1px;*/ + text-align: left; +} + +.preview-toggle span:hover { + cursor: pointer; +} + +.after-editor { + margin-top: 10px; +} + +.checkbox { + margin-left:5px; + font-weight:normal; + cursor:help +} + +.question-options { + margin-top: 1px; + color: #666; + line-height: 13px; + margin-bottom:5px; +} +.question-options label { + vertical-align: text-bottom; +} + +.edit-content-html { + border-top: 1px dotted #D8D2A9; + border-bottom: 1px dotted #D8D2A9; + margin: 5px 0 5px 0; +} + +.edit-question-page, #fmedit{ + color:@info-text-dark; + + #id_revision{ + font-size:14px; + margin-top:5px; + margin-bottom:5px; + } + #id_title{ + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border:#cce6ec 3px solid; + width:725px; + margin-bottom:10px; + } + #id_summary{ + border:#cce6ec 3px solid; + height:25px; + padding-left:5px; + width:395px; + font-size:14px; + } + .title-desc{ + margin-bottom:10px; + } +} + +/* ----- Question template ----- */ + +.question-page{ + + h1{ + padding-top:0px; + font-family:@main-font; + } + + h1 a{ + color:@question-link; + font-size:30px; + font-weight:normal; + line-height:1; + } + + p.rss { + float:none; + clear:both; + padding: 3px 0 0 23px; + font-size: 15px; + width:110px; + background-position:center left; + margin-left:0px !important; + } + + p.rss a { + font-family:@main-font; + vertical-align: top; + } + + .question-content{ + float:right; + width:690px; + margin-bottom:10px; + } + + #question-table{ + float:left; + border-top:#f0f0f0 1px solid; + } + + #question-table, + .answer-table { + margin: 6px 0 0px 0; + border-spacing: 0px; + width: 680px; + padding-right:3px; + } + + .answer-table { + margin-top:0px; + border-bottom: 1px solid #D4D4D4; + float:left; + } + + .answer-table td, + #question-table td { + width:20px; + vertical-align:top; + } + .question-body, .answer-body { + overflow: auto; + margin-top:10px; + font-family:@body-font; + color:#4b4b4b; + + p{ + margin-bottom:14px; + line-height:1.4; + font-size:14px; + padding:0px 5px 5px 0px; + } + + a { + color:@link; + } + + li { + margin-bottom:7px; + } + } + + .question-body IMG, .answer-body IMG { + max-width: 600px; + } + + .post-update-info-container { + float: right; + width: 175px; + } + + .post-update-info { + background: #fff url(../images/background-user-info.png) repeat-x bottom; + float: right; + font-size: 9px; + font-family:@secondary-font; + width: 158px; + padding:4px; + margin:0px 0px 5px 5px; + line-height: 14px; + .rounded-corners(4px); + .box-shadow (0px, 2px,1px,#bfbfbf); + + p { + line-height: 13px; + font-size: 11px; + margin: 0 0 2px 1px; + padding: 0; + } + a{ + color:#444; + } + .gravatar { + float: left; + margin-right: 4px; + } + + p.tip { + color: #444; + line-height: 13px; + font-size: 10px; + } + } + + .post-controls{ + font-size: 11px; + line-height: 12px; + min-width: 200px; + padding-left: 5px; + text-align:right; + clear: left; + float: right; + margin-top:10px; + + a { + color: #777; + padding: 0px 3px 3px 22px; + cursor: pointer; + border: none; + font-size:12px; + font-family:@body-font; + text-decoration: none; + height:18px; + display:block; + float:right; + line-height:18px; + margin-top:-2px; + margin-left:4px; + } + + a:hover { + background-color: #f5f0c9; + + } + .sep { + color: #ccc; + float:right; + height:18px; + font-size:18px; + } + } + .post-controls, .answer-controls{ + .question-delete{ + background: url(../images/delete.png) no-repeat center left; + padding-left:16px; + } + .question-flag{ + background: url(../images/flag.png) no-repeat center left; + } + .question-edit{ + background: url(../images/edit2.png) no-repeat center left; + } + .question-retag{ + background: url(../images/retag.png) no-repeat center left; + } + .question-close{ + background: url(../images/close.png) no-repeat center left; + } + .permant-link{ + background: url(../images/link.png) no-repeat center left; + } + } + .tabBar{ + width:100%; + } + + #questionCount{ + float:left; + font-family:@main-font; + line-height:15px; + } + + .question-img-upvote, .question-img-downvote, + .answer-img-upvote, .answer-img-downvote { + width: 25px; + height: 20px; + cursor:pointer; + } + + .question-img-upvote, .answer-img-upvote { + background: url(../images/vote-arrow-up-new.png) no-repeat; + } + + .question-img-downvote, .answer-img-downvote { + background: url(../images/vote-arrow-down-new.png) no-repeat; + } + + .question-img-upvote:hover, .question-img-upvote.on, + .answer-img-upvote:hover, .answer-img-upvote.on { + background: url(../images/vote-arrow-up-on-new.png) no-repeat; + } + + .question-img-downvote:hover, .question-img-downvote.on, + .answer-img-downvote:hover, .answer-img-downvote.on { + background: url(../images/vote-arrow-down-on-new.png) no-repeat; + } + + .question-img-favorite:hover { + background: url(../images/vote-favorite-on.png) + } + div.comments { + padding: 0; + } + #comment-title{ + font-weight:bold; + font-size:23px; + color:@section-title; + width:200px; + float:left; + font-family:@main-font; + } + .comments { + font-size: 12px; + clear: both; + + div.controls { + clear: both; + float:left; + width: 100%; + margin: 3px 0 20px 5px; + } + + .controls a { + color: #988e4c; + padding: 0 3px 2px 22px; + font-family:@body-font; + font-size:13px; + background:url(../images/comment.png) no-repeat center left; + } + + .controls a:hover { + background-color: #f5f0c9; + text-decoration: none; + } + + .button { + color: #988e4c; + font-size: 11px; + padding: 3px; + cursor: pointer; + } + a { + background-color: inherit; + color: @link; + padding: 0; + } + + form.post-comments { + margin: 3px 30px 4px 5px; + } + + textarea { + height: 42px; + width:100%; + margin: 12px 0 5px 1px; + font-family: @body-font; + outline: none; + overflow:auto; + font-size: 12px; + line-height: 140%; + padding-left:2px; + padding-top:4px; + border:#cce6ec 3px solid; + } + + input { + margin-left: 10px; + margin-top: 1px; + vertical-align: top; + width: 100px; + } + button{ + background:url(../images/small-button-blue.png) repeat-x top; + border:0; + color:@button-label; + font-size:12px; + width:95px; + font-weight:bold; + height:24px; + margin-top:-2px; + cursor:pointer; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080); + float:left; + } + button:hover{ + background: url(../images/small-button-blue.png) bottom repeat-x; + .text-shadow(0px, 1px, 0px, #c6d9dd); + } + .counter { + display: inline-block; + width: 245px; + float:right; + color:#b6a475 !important; + vertical-align: top; + font-family:@body-font; + float:right; + text-align:right; + } + .comment { + border-bottom: 1px solid #edeeeb; + margin: 0; + margin-top:8px; + padding-bottom:4px; + overflow: auto; + font-family:@body-font; + font-size:11px; + min-height: 25px; + background:url(../images/comment-background.png) bottom repeat-x; + .rounded-corners(5px); + } + div.comment:hover { + background-color: #efefef; + } + a.author{ + background-color: inherit; + color: @link; + padding: 0; + } + + a.author:hover { + text-decoration: underline; + } + span.delete-icon{ + background:url(../images/close-small.png) no-repeat; + } + span.delete-icon:hover{ + border:#BC564B 2px solid; + .rounded-corners(10px); + + } + .content { + margin-bottom: 7px; + } + + .comment-votes { + float: left; + width: 37px; + line-height: 130%; + padding: 6px 5px 6px 3px; + } + + .comment-body { + line-height: 1.3; + margin: 3px 26px 0 46px; + padding: 5px 3px; + color: #666; + font-size:13px; + } + + .comment-body p{ + font-size:13px; + line-height:1.3; + margin-bottom: 3px; + padding: 0; + } + + .comment-delete { + float: right; + width: 14px; + line-height: 130%; + padding: 8px 6px; + } + + .upvote { + margin: 0px; + padding-right: 17px; + padding-top: 2px; + text-align: right; + height: 20px; + font-size: 13px; + font-weight: bold; + color: #777; + } + + .upvote.upvoted { + color: #d64000; + } + + .upvote.hover { + background: url(../images/go-up-grey.png) no-repeat; + background-position: right 1px; + } + + .upvote:hover { + background: url(../images/go-up-orange.png) no-repeat; + background-position: right 1px; + } + + .help-text{ + float: right; + text-align:right; + color: gray; + margin-bottom: 0px; + margin-top: 0px; + line-height: 50%; + } + } + #questionTools { + font-size: 22px; + margin-top: 11px; + text-align: left; + } + + .question-status { + margin-top: 10px; + margin-bottom:15px; + padding: 20px; + background-color: #fef7cc; + text-align: center; + border:#e1c04a 1px solid; + } + + .question-status h3 { + font-size: 20px; + color:@info-text; + font-weight:normal; + } + + .vote-buttons { + float: left; + text-align: center; + padding-top: 2px; + margin:3px 10px 0px 3px; + } + + .vote-buttons IMG { + cursor: pointer; + } + + .vote-number { + font-family: @main-font; + padding: 0px 0 5px 0; + font-size: 25px; + font-weight: bold; + color: #777; + } + + .vote-buttons .notify-sidebar { + text-align: left; + } + .vote-buttons .notify-sidebar label { + vertical-align: top; + } + + .tabBar-answer{ + margin-bottom:15px; + padding-left:7px; + width:723px; + margin-top:10px; + } + .answer{ + .vote-buttons { + float:left; + } + } + .accepted-answer { + background-color: #f7fecc; + border-bottom-color: #9BD59B; + + .vote-buttons { + width:27px; + margin-right:10px; + } + } + + .answer .post-update-info a{ + color:#444444; + } + + .accepted-answer .comments { + background-color: #f1f6d4; + } + + .answered { + background: #CCC; + color: #999; + } + + .answered-accepted { + background: #DCDCDC; + color: #763333; + + strong { + color: #E1E818; + } + } + + .answered-by-owner { + background: #F1F1FF; + + .comments .button { + background-color: #E6ECFF; + } + .comments { + background-color: #E6ECFF; + } + .vote-buttons { + margin-right:10px; + } + } + + .answer-img-accept:hover { + background: url(../images/vote-accepted-on.png) + } + .answer-body a { + color:@link; + } + .answer-body li { + margin-bottom:0.7em; + } + + #fmanswer{ + color:@info-text; + line-height:1.2; + margin-top:10px; + p{ + font-size:13px; + line-height:1.3; + } + h2{ + font-family:@main-font; + color:@section-title; + font-size:24px; + } + label{ + font-size:13px; + } + } + .message { + padding: 5px; + margin: 0px 0 10px 0; + + } + +} + +.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { + background: url(../images/socialsprite.png) no-repeat; + display:block; + text-indent:-100em; + height:25px; + width:25px; + margin-bottom:3px; +} + +.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover{ + opacity:0.8; + filter: alpha(opacity=80); +} + +.facebook-share.icon { + background-position: -26px 0px; +} +.identica-share.icon { + background-position: -78px 0px; +} +.twitter-share.icon { + margin-top:10px; + background-position: 0px 0px; +} +.linkedin-share.icon { + background-position: -52px 0px; +} + +/* -----Content pages, Login, About, FAQ, Users----- */ + +.openid-signin, +.meta, +.users-page, +{ + font-size:13px; + line-height:1.3; + color:@info-text-dark; + p{ + font-size:13px; + color:@info-text; + line-height:1.3; + font-family:@body-font; + color:@info-text-dark; + margin-bottom:12px; + } + h2{ + color:@info-text-dark; + padding-left:0px; + font-size:16px; + } + #id_email,#id_name{ + border:#cce6ec 3px solid; + height:25px; + padding-left:5px; + width:395px; + font-size:14px; + } + textarea{ + border:#cce6ec 3px solid; + padding-left:5px; + padding-top:5px; + width:395px; + font-size:14px; + } + input.submit{ + background:url(../images/small-button-blue.png) repeat-x top; + border:0; + color:@button-label; + font-weight:bold; + font-size:12px; + height:24px; + margin-top:-2px; + cursor:pointer; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080); + } + input.submit:hover{ + background:url(../images/small-button-blue.png) repeat-x bottom; + text-decoration:none; + } + .cancel{ + background:url(../images/small-button-cancel.png) repeat-x top !important; + color:#525252 !important; + } + .cancel:hover{ + background:url(../images/small-button-cancel.png) repeat-x bottom !important; + } +} + +#email-input-fs,#local_login_buttons,#password-fs,#openid-fs{ + margin-top:10px; + #id_email,#id_username,#id_password,input{ + font-size: 12px; + line-height: 20px; + height: 20px; + margin: 0px; + padding: 0px 0 0 5px; + border:#cce6ec 3px solid; + width:200px; + } + .submit-b{ + background:url(../images/small-button-blue.png) repeat-x top; + border:0; + color:@button-label; + font-weight:bold; + font-size:12px; + height:24px; + margin-top:-2px; + cursor:pointer; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080) + } + .submit-b:hover{ + background:url(../images/small-button-blue.png) repeat-x bottom; + } +} +.openid-input { + background: url(../images/openid.gif) no-repeat; + padding-left: 15px; + cursor: pointer; +} + +.openid-login-input { + background-position: center left; + background: url(../images/openid.gif) no-repeat 0% 50%; + padding: 5px 5px 5px 15px; + cursor: pointer; + font-family: Trebuchet MS; + font-weight: 300; + font-size: 150%; + width: 500px; +} + +.openid-login-submit { + height: 40px; + width: 80px; + line-height: 40px; + cursor: pointer; + border: 1px solid #777; + font-weight: bold; + font-size: 120%; +} + +/* People page */ + +.tabBar-user{ + width:375px; +} + +.user { + padding: 5px; + line-height: 140%; + width: 166px; + border:#eee 1px solid; + margin-bottom:5px; + .rounded-corners(3px); + .user-micro-info{ + color:@info-text-dark; + } + +} + +.user ul { + margin: 0; + list-style-type: none; +} + +.user .thumb { + clear: both; + float: left; + margin-right: 4px; + display: inline; +} + +/* tags page */ + +.tabBar-tags{ + width:270px; + margin-bottom:15px; +} + +/* badges page */ + +a.medal { + font-size: 17px; + line-height: 250%; + margin-right:5px; + 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; +} + +a:hover.medal { + color: #333; + text-decoration: none; + background: url(../images/medala_on.gif) no-repeat; + border-left: 1px solid #E7E296; + border-top: 1px solid #E7E296; + border-bottom: 1px solid #D1CA3D; + border-right: 1px solid #D1CA3D; +} + +#award-list{ + .user{ + float:left; + margin:5px; + } +} + +/* profile page */ + +.tabBar-profile{ + width:100%; + margin-bottom:15px; + float:left; +} + +.user-profile-page{ + font-size:13px; + color:@info-text-dark; + + p{ + font-size:13px; + line-height:1.3; + color:@info-text-dark; + } + .avatar img{ + border:#eee 1px solid; + padding:5px; + } + h2{ + padding:10px 0px 10px 0px; + font-family:@main-font; + } +} + +.user-details { + font-size: 13px; + h3{ + font-size:16px; + } +} + +.user-about { + background-color: #EEEEEE; + height: 200px; + line-height: 20px; + overflow: auto; + padding: 10px; + width: 90%; + p{font-size:13px;} +} + +.follow-toggle,.submit { + border:0 !important; + color:@button-label; + font-weight:bold; + font-size:12px; + height:26px; + line-height:26px; + margin-top:-2px; + font-size:15px; + cursor:pointer; + font-family:@main-font; + background:url(../images/small-button-blue.png) repeat-x top; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080) +} + +.follow-toggle:hover, .submit:hover { + background:url(../images/small-button-blue.png) repeat-x bottom; + text-decoration:none !important; +} + +.follow-toggle .follow{ + font-color: #000; + font-style:normal; +} + +.follow-toggle .unfollow div.unfollow-red{ + display:none; +} + +.follow-toggle .unfollow:hover div.unfollow-red{ + display:inline; + color:#fff; + font-weight:bold; + color:#A05736; +} + +.follow-toggle .unfollow:hover div.unfollow-green{ + display:none; +} + +.count { + font-family: @main-font; + font-size: 200%; + font-weight: 700; + color: #777 +} + +.scoreNumber { + font-family: @main-font; + font-size: 35px; + font-weight: 800; + color: #777; + line-height: 40px; /*letter-spacing:0px*/ + margin-top: 3px; +} + +.vote-count { + font-family: Arial; + font-size: 160%; + font-weight: 700; + color: #777; +} + +.answer-summary { + display: block; + clear: both; + padding: 3px; +} + +.answer-votes { + background-color: #EEEEEE; + color: #555555; + float: left; + font-family: Arial; + font-size: 15px; + font-weight: bold; + height: 17px; + padding: 2px 4px 5px; + text-align: center; + text-decoration: none; + width: 20px; + margin-right: 10px; + .rounded-corners(4px); +} + +.karma-summary { + padding:5px; + font-size:13px; +} + +.karma-summary h3 { + text-align: center; + font-weight: bold; + padding:5px; +} + +.karma-diagram { + width:477px; + height:300px; + float:left; + margin-right:10px; +} + +.karma-details { + float:right; + width:450px; + height:250px; + overflow-y:auto; + word-wrap:break-word; + p{margin-bottom:10px;} +} + +.karma-gained { + font-weight:bold; + background:#eee; + width:25px; + margin-right:5px; + color:green; + padding:3px; + display:block; + float:left; + text-align:center; + .rounded-corners(3px); +} + +.karma-lost { + font-weight:bold; + background:#eee; + width:25px; + color:red; + padding:3px; + display:block; + margin-right:5px; + float:left; + text-align:center; + .rounded-corners(3px); +} + +.submit-row{ + margin-bottom:10px; +} + +/*----- Revision pages ----- */ + +.revision { + margin: 10px 0 10px 0; + font-size: 13px; + color:@info-text-dark; + + p{ + font-size:13px; + line-height:1.3; + color:@info-text-dark; + } + + h3{ + font-family:@main-font; + font-size:21px; + padding-left:0px; + } + + .header { + background-color: #F5F5F5; + padding: 5px; + cursor: pointer; + } + + .author { + background-color: #e9f3f5; + } + + .summary { + padding: 5px 0 10px 0; + } + + .summary span { + background-color:#fde785; + padding:6px; + .rounded-corners(4px); + display: inline; + .box-shadow(1px, 1px, 4px, #cfb852); + } + + .answerbody { + padding: 10px 0 5px 10px; + } + + .revision-mark { + width: 150px; + text-align: left; + display: inline-block; + font-size: 11px; + overflow: hidden; + + .gravatar{ + float:left; + margin-right:4px; + padding-top:5px; + } + } + + .revision-number { + font-size: 300%; + font-weight: bold; + font-family: sans-serif; + } +} + +del, del .post-tag { + color: #C34719; +} + +ins .post-tag, ins p, ins { + background-color: #E6F0A2; +} + +/* ----- Red Popup notification ----- */ + +.vote-notification { + z-index: 1; + cursor: pointer; + display: none; + position: absolute; + font-family:@secondary-font; + font-size:14px; + font-weight:normal; + color: white; + background-color: #8e0000; + text-align: center; + padding-bottom:10px; + .box-shadow(0px, 2px, 4px, #370000); + .rounded-corners(4px); + + h3{ + background:url(../images/notification.png) repeat-x top; + padding:10px 10px 10px 10px; + font-size:13px; + margin-bottom:5px; + border-top:#8e0000 1px solid; + color:#fff; + font-weight:normal; + .rounded-corners-top(4px); + } + a { + color: #fb7321; + text-decoration: underline; + font-weight:bold; + } + +} + + +/* ----- Footer links , check blocks/footer.html----- */ + +#ground { + width: 100%; + clear: both; + border-top: 1px solid #000; + padding: 6px 0 0 0; + background: @header-color; + font-size:16px; + font-family:@main-font; + + p { + margin-bottom:0; + } +} + +.footer-links { + color: #EEE; + text-align:left; + width:500px; + float:left; + a { + color: #e7e8a8; + } +} + +.powered-link{ + width:500px; + float:left; + text-align:left; + a{ + color:#8ebcc7; + } +} + +.copyright{ + color:#616161; + width:450px; + float:right; + text-align:right; + + a{ + color:#8ebcc7; + } + img.license-logo { + margin: 6px 0px 20px 10px; + float:right; + } +} + + +.notify-me { + float: left; +} + + +span.text-counter { + margin-right: 20px; +} + +span.form-error { + color: #990000; + font-weight: normal; + margin-left: 5px; +} + +p.form-item { + margin: 0px; +} + + + + +.deleted { + background: #F4E7E7 none repeat scroll 0 0; +} + + +/* openid styles */ +.form-row { + line-height: 25px; +} + +table.form-as-table { + margin-top: 5px; +} + +table.form-as-table ul { + list-style-type: none; + display: inline; +} + +table.form-as-table li { + display: inline; +} + +table.form-as-table td { + text-align: right; +} + +table.form-as-table th { + text-align: left; + font-weight: normal; +} + +table.ab-subscr-form { + width: 45em; +} + +table.ab-tag-filter-form { + width: 45em; +} + +.submit-row { + line-height: 30px; + padding-top: 10px; + display: block; + clear: both; +} + +.errors { + line-height: 20px; + color: red; +} + +.error { + color: darkred; + margin: 0; + font-size: 10px; +} + +label.retag-error { + color: darkred; + padding-left: 5px; + font-size: 10px; +} + +.fieldset { + border: none; + margin-top: 10px; + padding: 10px; +} + + +span.form-error { + color: #990000; + font-size: 90%; + font-weight: normal; + margin-left: 5px; +} + + +/* +.favorites-count-off { + color: #919191; + float: left; + text-align: center; +} + +.favorites-count { + color: #D4A849; + float: left; + text-align: center; +} +*/ + +/* todo: get rid of this in html */ +.favorites-empty { + width: 32px; + height: 45px; + float: left; +} + +.user-info-table { + margin-bottom: 10px; + border-spacing: 0; +} + +/* todo: remove this hack? */ +.user-stats-table .narrow { + width: 660px; +} + +.narrow .summary h3 { + padding: 0px; + margin: 0px; +} + +.relativetime { + font-weight: bold; + text-decoration: none; +} + +.narrow .tags { + float: left; +} + + + + +/* todo: make these more semantic */ +.user-action-1 { + font-weight: bold; + color: #333; +} + +.user-action-2 { + font-weight: bold; + color: #CCC; +} + +.user-action-3 { + color: #333; +} + +.user-action-4 { + color: #333; +} + +.user-action-5 { + color: darkred; +} + +.user-action-6 { + color: darkred; +} + +.user-action-7 { + color: #333; +} + +.user-action-8 { + padding: 3px; + font-weight: bold; + background-color: #CCC; + color: #763333; +} + +.revision-summary { + background-color: #FFFE9B; + padding: 2px; +} + +.question-title-link a { + font-weight: bold; + color: #0077CC; +} + +.answer-title-link a { + color: #333; +} + +/* todo: make these more semantic */ +.post-type-1 a { + font-weight: bold; + +} + +.post-type-3 a { + font-weight: bold; + +} + +.post-type-5 a { + font-weight: bold; +} + +.post-type-2 a { + color: #333; +} + +.post-type-4 a { + color: #333; +} + +.post-type-6 a { + color: #333; +} + +.post-type-8 a { + color: #333; +} + +.hilite { + background-color: #ff0; +} + +.hilite1 { + background-color: #ff0; +} + +.hilite2 { + background-color: #f0f; +} + +.hilite3 { + background-color: #0ff; +} + +.gold, .badge1 { + color: #FFCC00; +} + +.silver, .badge2 { + color: #CCCCCC; +} + +.bronze, .badge3 { + color: #CC9933; +} + +.score { + font-weight: 800; + color: #333; +} + + +a.comment { + background: #EEE; + color: #993300; + padding: 5px; +} + +a.offensive { + color: #999; +} + +.message h1 { + padding-top: 0px; + font-size: 15px; +} + +.message p { + margin-bottom: 0px; +} + +p.space-above { + margin-top: 10px; +} + +.warning { + color: red; +} + + + +button::-moz-focus-inner { + padding:0; + border:none; +} +.submit { + cursor: pointer; /*letter-spacing:1px;*/ + background-color: #D4D0C8; + height: 30px; + border: 1px solid #777777; /* width:100px; */ + font-weight: bold; + font-size: 120%; +} + +.submit:hover { + text-decoration: underline; +} + +.submit.small { + margin-right:5px; + height:20px; + font-weight:normal; + font-size:12px; + padding:1px 5px; +} +.submit.small:hover { + text-decoration:none; +} +.question-page a.submit { + display: -moz-inline-stack; + display: inline-block; + line-height: 30px; + padding: 0 5px; + *display: inline; +} + +.noscript { + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 5px 0; + text-align: center; + font-family: sans-serif; + font-size: 120%; + font-weight: Bold; + color: #FFFFFF; + background-color: #AE0000; +} + +.big { + font-size: 14px; +} + +.strong { + font-weight: bold; +} + +.orange {/* used in django.po */ + color: #d64000; + font-weight: bold; +} + +.grey { + color: #808080; +} + +.about div { + padding: 10px 5px 10px 5px; + border-top: 1px dashed #aaaaaa; +} + +.highlight { + background-color: #FFF8C6; +} + +.nomargin { + margin: 0; +} + +.margin-bottom { + margin-bottom: 10px; +} + +.margin-top { + margin-top: 10px; +} + +.inline-block { + display: inline-block; +} + +.action-status { + margin: 0; + border: none; + text-align: center; + line-height: 10px; + font-size: 12px; + padding: 0; +} + +.action-status span { + padding: 3px 5px 3px 5px; + background-color: #fff380; /* nice yellow */ + font-weight: normal; + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + -webkit-border-radius: 5px; +} + +.list-table td { + vertical-align: top; +} + +/* these need to go */ +table.form-as-table .errorlist { + display: block; + margin: 0; + padding: 0 0 0 5px; + text-align: left; + font-size: 10px; + color: darkred; +} + +table.form-as-table input { + display: inline; + margin-left: 4px; +} + +table.form-as-table th { + vertical-align: bottom; + padding-bottom: 4px; +} + +.form-row-vertical { + margin-top: 8px; + display: block; +} + +.form-row-vertical label { + margin-bottom: 3px; + display: block; +} + +/* above stuff needs to go */ +.text-align-right { + text-align: center; +} + +ul.form-horizontal-rows { + list-style: none; + margin: 0; +} + +ul.form-horizontal-rows li { + position: relative; + height: 40px; +} + +ul.form-horizontal-rows label { + display: inline-block; +} + +ul.form-horizontal-rows ul.errorlist { + list-style: none; + color: darkred; + font-size: 10px; + line-height: 10px; + position: absolute; + top: 2px; + left: 180px; + text-align: left; + margin: 0; +} + +ul.form-horizontal-rows ul.errorlist li { + height: 10px; +} + +ul.form-horizontal-rows label { + position: absolute; + left: 0px; + bottom: 6px; + margin: 0px; + line-height: 12px; + font-size: 12px; +} + +ul.form-horizontal-rows li input { + position: absolute; + bottom: 0px; + left: 180px; + margin: 0px; +} + +.narrow .summary { + float: left; +} + +.user-profile-tool-links { + font-weight: bold; + vertical-align: top; +} + + +ul.post-tags { + margin-left: 7px; +} +ul.post-tags li { + margin-top: 4px; + margin-bottom: 3px; +} + +ul.post-retag { + margin-bottom:0px; + margin-left:5px; +} + +#question-controls .tags { + margin: 0 0 3px 0; +} + +#tagSelector { + padding-bottom: 2px; + margin-bottom: 0; +} + +#related-tags { + padding-left: 3px; +} + +#hideIgnoredTagsControl { + margin: 5px 0 0 0; +} + +#hideIgnoredTagsControl label { + font-size: 12px; + color: #666; +} + +#hideIgnoredTagsCb { + margin: 0 2px 0 1px; +} + +#recaptcha_widget_div { + width: 318px; + float: left; + clear: both; +} + +p.signup_p { + margin: 20px 0px 0px 0px; +} + +.simple-subscribe-options ul { + list-style: none; + list-style-position: outside; + margin: 0; +} + +/* a workaround to set link colors correctly */ + +.wmd-preview a { + color:@link; +} + +.wmd-preview li { + margin-bottom:7px; + font-size:14px; +} + +.search-result-summary { + font-weight: bold; + font-size:18px; + line-height:22px; + margin:0px 0px 0px 0px; + padding:2px 0 0 0; + float: left; +} + +.faq-rep-item { + text-align:right; + padding-right:5px; +} + + +.user-info-table .gravatar { + margin:0; +} + +#responses { + clear:both; + line-height:18px; + margin-bottom:15px; +} + +#responses div.face { + float:left; + text-align: center; + width: 54px; + padding: 3px; + overflow:hidden; +} + +.response-parent { + margin-top: 18px; +} + +.response-parent strong{ + font-size: 20px; +} + +.re { + min-height: 57px; + clear: both; + margin-top: 10px; +} + +#responses input { + float:left; +} +#re_tools { + margin-bottom:10px; +} +#re_sections { + margin-bottom:6px; +} +#re_sections .on { + font-weight:bold; +} + +.avatar-page ul { + list-style: none; +} +.avatar-page li { + display: inline; +} +.user-profile-page .avatar p { + margin-bottom: 0px; +} +.user-profile-page .tabBar a#stats { + margin-left: 0; +} +.user-profile-page img.gravatar { + margin: 2px 0 3px 0; +} +.user-profile-page h3 { + padding: 0; + margin-top: -3px; +} +.userList { + font-size: 13px; +} + +img.flag { + border: 1px solid #eee; + vertical-align: text-top; +} + +.main-page img.flag { + vertical-align: text-bottom; +} + + +/* Pretty printing styles. Used with prettify.js. */ + +a.edit { + padding-left:3px; + color: #145bff; +} + +.str { color: #080; } +.kwd { color: #008; } +.com { color: #800; } +.typ { color: #606; } +.lit { color: #066; } +.pun { color: #660; } +.pln { color: #000; } +.tag { color: #008; }/* name conflict here */ +.atn { color: #606; } +.atv { color: #080; } +.dec { color: #606; } +pre.prettyprint { padding: 3px; border: 0px solid #888; } + +@media print { + .str { color: #060; } + .kwd { color: #006; font-weight: bold; } + .com { color: #600; font-style: italic; } + .typ { color: #404; font-weight: bold; } + .lit { color: #044; } + .pun { color: #440; } + .pln { color: #000; } + .tag { color: #006; font-weight: bold; } + .atn { color: #404; } + .atv { color: #060; } +} diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index f84e031d..9e44494b 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -14,7 +14,7 @@ {% endif %} </head> {% endspaceless %} - <body class="{% block body_class %}{% endblock %}{% if page_class %} {{page_class}}{% endif %}"> + <body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}"> {% include "widgets/system_messages.html" %} {% include "custom_header.html" ignore missing %} {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #} diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html index deef318c..e35113dd 100644 --- a/askbot/skins/default/templates/main_page/javascript.html +++ b/askbot/skins/default/templates/main_page/javascript.html @@ -34,8 +34,13 @@ askbot['urls']['unmark_tag'] = scriptUrl + '{% url unmark_tag %}'; askbot['urls']['set_tag_filter_strategy'] = '{% url "set_tag_filter_strategy" %}'; askbot['urls']['questions'] = '{% url "questions" %}'; + {% if settings.ASKBOT_TRANSLATE_URL %} askbot['urls']['question_url_template'] = scriptUrl + '{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/" }}'; askbot['urls']['user_url_template'] = scriptUrl + '{% trans %}users/{% endtrans %}{{ "{{user_id}}" }}/{{ "{{slug}}" }}/'; + {% else %} + askbot['urls']['question_url_template'] = scriptUrl + 'question/{{ "{{QuestionID}}/" }}'; + askbot['urls']['user_url_template'] = scriptUrl + 'users/{{ "{{user_id}}" }}/{{ "{{slug}}" }}/'; + {% endif %} askbot['messages']['name_of_anonymous_user'] = '{{ name_of_anonymous_user }}'; </script> <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script> diff --git a/askbot/skins/default/templates/main_page/nothing_found.html b/askbot/skins/default/templates/main_page/nothing_found.html index 50f2f340..e6d65ea5 100644 --- a/askbot/skins/default/templates/main_page/nothing_found.html +++ b/askbot/skins/default/templates/main_page/nothing_found.html @@ -5,7 +5,7 @@ {% endif %} {% if scope == "favorite" %} {% trans %}No questions here. {% endtrans %} - {% trans %}Please star (bookmark) some questions or follow some users.{% endtrans %} + {% trans %}Please follow some questions or follow some users.{% endtrans %} {% endif %} </p> {% if query or search_tags or author_name %} diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html index 1f63b468..0df25e7c 100644 --- a/askbot/skins/default/templates/meta/bottom_scripts.html +++ b/askbot/skins/default/templates/meta/bottom_scripts.html @@ -37,11 +37,8 @@ src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" {% endif %} ></script> -<script type='text/javascript' src="{{"/js/i18n.js"|media }}"></script> -<script type='text/javascript' src="{{"/js/jquery.i18n.js"|media }}"></script> -<script type='text/javascript' src="{% url "askbot_jsi18n" %}"></script> <script type='text/javascript' src="{{"/js/utils.js"|media }}"></script> -<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'> +<script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script> {% if settings.ENABLE_MATHJAX %} <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js"> MathJax.Hub.Config({ diff --git a/askbot/skins/default/templates/meta/html_head_stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html index 9d5aebad..4e3f173b 100644 --- a/askbot/skins/default/templates/meta/html_head_stylesheets.html +++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html @@ -1,5 +1,10 @@ -<link href="{{"/style/style.css"|media }}" rel="stylesheet/less" type="text/css" /> +{%if settings.DEBUG %} +<link href="{{"/style/style.less"|media }}" rel="stylesheet/less" type="text/css" /> <script type="text/javascript" src="{{"/js/less.min.js"|media}}"></script> +{%else%} +<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" /> +{%endif%} +<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'> {{ skin.get_extra_css_link() }} {% if settings.USE_CUSTOM_CSS %} <link @@ -8,8 +13,3 @@ type="text/css" /> {% endif %} -{% if user_messages %} -<style type="text/css"> - body { margin-top:2.4em; } -</style> -{% endif %} diff --git a/askbot/skins/default/templates/question/javascript.html b/askbot/skins/default/templates/question/javascript.html index 552155de..c5dd9f37 100644 --- a/askbot/skins/default/templates/question/javascript.html +++ b/askbot/skins/default/templates/question/javascript.html @@ -11,9 +11,14 @@ askbot['urls']['editComment'] = '{% url edit_comment %}'; askbot['urls']['deleteComment'] = '{% url delete_comment %}'; askbot['urls']['getComment'] = '{% url get_comment %}'; + {%if settings.ASKBOT_TRANSLATE_URL %} askbot['urls']['question_url_template'] = scriptUrl + '{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/{{questionSlug}}" }}';{# yes it needs to be that whacky #} - askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}'; askbot['urls']['vote_url_template'] = scriptUrl + '{% trans %}questions/{% endtrans %}{{ "{{QuestionID}}/" }}{% trans %}vote/{% endtrans %}'; + {%else%} + askbot['urls']['question_url_template'] = scriptUrl + 'question/{{ "{{QuestionID}}/{{questionSlug}}" }}';{# yes it needs to be that whacky #} + askbot['urls']['vote_url_template'] = scriptUrl + 'questions/{{ "{{QuestionID}}/" }}vote/'; + {%endif%} + askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}'; askbot['urls']['swap_question_with_answer'] = '{% url swap_question_with_answer %}'; askbot['urls']['upvote_comment'] = '{% url upvote_comment %}'; askbot['messages']['addComment'] = '{% trans %}add comment{% endtrans %}'; diff --git a/askbot/tests/__init__.py b/askbot/tests/__init__.py index a9fa761b..ca74d696 100644 --- a/askbot/tests/__init__.py +++ b/askbot/tests/__init__.py @@ -1,3 +1,4 @@ +from askbot.tests.cache_tests import * from askbot.tests.email_alert_tests import * from askbot.tests.on_screen_notification_tests import * from askbot.tests.page_load_tests import * @@ -11,5 +12,5 @@ from askbot.tests.form_tests import * from askbot.tests.follow_tests import * from askbot.tests.templatefilter_tests import * from askbot.tests.markup_test import * -from askbot.tests.misc_tests import * +#from askbot.tests.misc_tests import * from askbot.tests.post_model_tests import * diff --git a/askbot/tests/cache_tests.py b/askbot/tests/cache_tests.py new file mode 100644 index 00000000..5eda8c74 --- /dev/null +++ b/askbot/tests/cache_tests.py @@ -0,0 +1,43 @@ +from django.db import connection +from django.core.urlresolvers import reverse +from django.conf import settings +from askbot.tests.utils import AskbotTestCase + +class CacheTests(AskbotTestCase): + def setUp(self): + self.create_user() + self.create_user('other_user') + self.question = self.post_question() + self.post_answer(question = self.question) + settings.DEBUG = True # because it's forsed to False + + def visit_question(self): + self.client.get(self.question.get_absolute_url(), follow=True) + + def test_anonymous_question_cache(self): + + self.visit_question() + counter = len(connection.queries) + print 'we have %d queries' % counter + self.visit_question() + + #second hit to the same question should give fewer queries + self.assertTrue(counter > len(connection.queries)) + settings.DEBUG = False + + def test_authentificated_no_question_cache(self): + url = reverse('question', kwargs={'id': self.question.id}) + + password = '123' + self.other_user.set_password(password) + self.client.login(username=self.other_user.username, password=password) + + self.visit_question() + counter = len(connection.queries) + self.visit_question() + + #expect the same number of queries both times + self.assertEqual(counter, len(connection.queries)) + settings.DEBUG = False + + diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py index e1268d9f..b54bb2e9 100644 --- a/askbot/tests/db_api_tests.py +++ b/askbot/tests/db_api_tests.py @@ -5,7 +5,6 @@ e.g. ``some_user.do_something(...)`` """ from django.core import exceptions from django.core.urlresolvers import reverse -from django.db import connection from django.test.client import Client from django.conf import settings from askbot.tests.utils import AskbotTestCase @@ -43,37 +42,6 @@ class DBApiTests(AskbotTestCase): self.assertTrue(post.deleted_by == None) self.assertTrue(post.deleted_at == None) - def test_anonymous_question_cache(self): - question = self.post_question() - settings.DEBUG = True # because it's forsed to False - url = reverse('question', kwargs={'id': question.id}) - - client = Client() - client.get(url, follow=True) - counter = len(connection.queries) - client.get(url, follow=True) - - self.assertTrue(counter > len(connection.queries)) - self.assertEqual(3, len(connection.queries)) # session-related only - settings.DEBUG = False - - def test_authentificated_no_question_cache(self): - question = self.post_question() - settings.DEBUG = True # because it's forsed to False - url = reverse('question', kwargs={'id': question.id}) - - password = '123' - client = Client() - self.other_user.set_password(password) - client.login(username=self.other_user.username, password=password) - - client.get(url, follow=True) - counter = len(connection.queries) - client.get(url, follow=True) - - self.assertEqual(counter, len(connection.queries)) - settings.DEBUG = False - def test_flag_question(self): self.user.set_status('m') self.user.flag_post(self.question) diff --git a/askbot/urls.py b/askbot/urls.py index ec10d3b5..be21217b 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -284,7 +284,7 @@ urlpatterns = patterns('', url( r'^jsi18n/$', 'django.views.i18n.javascript_catalog', - {'packages': ('askbot',)}, + {'domain': 'djangojs','packages': ('askbot',)}, name = 'askbot_jsi18n' ), ) diff --git a/askbot/views/readers.py b/askbot/views/readers.py index f352a166..ec3ca57b 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -377,6 +377,7 @@ def question(request, id):#refactor - long subroutine. display question body, an """view that displays body of the question and all answers to it """ + #process url parameters #todo: fix inheritance of sort method from questions default_sort_method = request.session.get('questions_sort_method', 'votes') form = ShowQuestionForm(request.GET, default_sort_method) @@ -395,7 +396,14 @@ def question(request, id):#refactor - long subroutine. display question body, an #redirect also happens if id of the object's origin post != requested id show_post = None #used for permalinks if show_comment is not None: - #comments + #if url calls for display of a specific comment, + #check that comment exists, that it belongs to + #the current question + #if it is an answer comment and the answer is hidden - + #redirect to the default view of the question + #if the question is hidden - redirect to the main page + #in addition - if url points to a comment and the comment + #is for the answer - we need the answer object try: show_comment = models.Comment.objects.get(id = show_comment) if str(show_comment.get_origin_post().id) != id: @@ -418,7 +426,10 @@ def question(request, id):#refactor - long subroutine. display question body, an return HttpResponseRedirect(reverse('index')) elif show_answer is not None: - #answers + #if the url calls to view a particular answer to + #question - we must check whether the question exists + #whether answer is actually corresponding to the current question + #and that the visitor is allowed to see it try: show_post = get_object_or_404(models.Answer, id = show_answer) if str(show_post.question.id) != id: diff --git a/askbot/views/users.py b/askbot/views/users.py index 09acad07..130f79a4 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -668,7 +668,10 @@ def user_recent(request, user, context): 'activity_type' ) for award in awards: - related_object_type = get_related_object_type_name(content_type_id=award['content_type_id'], object_id=award['object_id']) + related_object_type = get_related_object_type_name( + content_type_id=award['content_type_id'], + object_id=award['object_id'] + ) activities.append( AwardEvent( award['awarded_at'], |