##// END OF EJS Templates
Merge remote changes
Bohdan Horbeshko -
r2115:c83a02f7 merge opera_mini_fix
parent child Browse files
Show More
@@ -66,3 +66,4 b' f781e25fcd29c996d7db34f7f2870eb5588c84dc'
66 7c9be4c674aca21bfeca37b40b4623614ec8573d 4.9.2
66 7c9be4c674aca21bfeca37b40b4623614ec8573d 4.9.2
67 944575007b175c10b47e6735afcffe83685b1981 4.10.0
67 944575007b175c10b47e6735afcffe83685b1981 4.10.0
68 84c8b976685942be27d91756d5fba2b2b31d810c 4.10.1
68 84c8b976685942be27d91756d5fba2b2b31d810c 4.10.1
69 2f9d7bc70eefbcfac840fea2727a8dd969292382 4.11.0
@@ -1,5 +1,5 b''
1 [Version]
1 [Version]
2 Version = 4.10.1 Rika
2 Version = 4.11.0 June
3 SiteName = Neboard DEV
3 SiteName = Neboard DEV
4
4
5 [Cache]
5 [Cache]
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -91,3 +91,7 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c \xd1\x82\xd0\xb5\xd0\xbc\xd1\x83"'
91
91
92 msgid "Hide/show"
92 msgid "Hide/show"
93 msgstr "Скрыть/показать"
93 msgstr "Скрыть/показать"
94
95 msgid "Rollover thread"
96 msgstr "Перекатить тему"
97
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -91,3 +91,7 b' msgstr "\xd0\x97\xd0\xbc\xd1\x96\xd0\xbd\xd0\xb8\xd1\x82\xd0\xb8 \xd0\xbd\xd0\xb8\xd1\x82\xd0\xba\xd1\x83"'
91
91
92 msgid "Hide/show"
92 msgid "Hide/show"
93 msgstr "Приховати/відобразити"
93 msgstr "Приховати/відобразити"
94
95 msgid "Rollover thread"
96 msgstr "Перекотити нитку"
97
@@ -330,6 +330,15 b' function addContextMenu() {'
330 }
330 }
331 },
331 },
332 visible: hasIp && canDeletePost
332 visible: hasIp && canDeletePost
333 },
334 rollover: {
335 name: gettext('Rollover thread'),
336 callback: function(key, opt) {
337 if (confirm(gettext('Are you sure?'))) {
338 window.location = '/all/?t_from_id=' + postId + '#form';
339 }
340 },
341 visible: isOpening
333 }
342 }
334 }
343 }
335 };
344 };
@@ -57,9 +57,24 b' class AllThreadsView(BaseBoardView, Pagi'
57 SETTING_SUBSCRIBE_BY_DEFAULT, False)
57 SETTING_SUBSCRIBE_BY_DEFAULT, False)
58
58
59 if not form:
59 if not form:
60 form = ThreadForm(error_class=PlainErrorList,
60 t_from_id = request.GET.get('t_from_id')
61 initial={FORM_TAGS: self.tag_name,
61 if t_from_id:
62 'subscribe': subscribe_by_default})
62 source_op = Post.objects.get(id=int(t_from_id))
63 tags_str = ' '.join([tag.get_name() for tag in source_op.get_thread().get_tags()])
64 post_link = '[post]{}[/post]'.format(source_op.id) #FIXME To constants
65 new_title = source_op.get_title() + ' NEW' # TODO More intelligent name change
66
67 form = ThreadForm(error_class=PlainErrorList,
68 initial={
69 FORM_TAGS: tags_str,
70 'subscribe': subscribe_by_default,
71 FORM_TEXT: post_link,
72 FORM_TITLE: new_title,
73 })
74 else:
75 form = ThreadForm(error_class=PlainErrorList,
76 initial={FORM_TAGS: self.tag_name,
77 'subscribe': subscribe_by_default})
63
78
64 self.settings_manager = get_settings_manager(request)
79 self.settings_manager = get_settings_manager(request)
65
80
General Comments 0
You need to be logged in to leave comments. Login now