Изменения документа HRlink. Новости об обновлениях

Сводка

• Свойства страницы (1 изменено, 0 добавлено, 0 удалено)

Подробности

Свойства страницы

Содержимое

...	...	@@ -1,33 +1,30 @@
1	1	{{velocity}}
	2	+#set($SPACE = "Blog.HRlink.-Novosti-ob-obnovleniiakh-")
2	2	#set($PERPAGE = 10)
3	3
4		-## префикс ветки, например: Blog.HRlink.-Novosti-ob-obnovleniiakh-.
5		-#set($full = $doc.fullName)
6		-#set($lastDot = $full.lastIndexOf('.'))
7		-#set($PREFIX = $full.substring(0, $lastDot) + ".")
8		-
9		-## пагинация
10	10	#set($p = $numbertool.toInteger($!request.get('p') ?: 1))
11		-#if($p < 1) #set($p = 1) #end
	6	+#set($p = $p < 1 ? 1 : $p)
12	12	#set($offset = ($p - 1) * $PERPAGE)
13	13
14		-## всего документов в ветке
15	15	#set($total = $services.query.hql(
16		- "select count(doc.fullName) from XWikiDocument doc " +
17		- "where doc.fullName like :prefix"
18		-).bindValue("prefix", $PREFIX + "%").execute().get(0))
	10	+ "select count(doc.fullName) " +
	11	+ "from XWikiDocument doc, BaseObject o " +
	12	+ "where o.name = doc.fullName and o.className = 'Blog.BlogPostClass' " +
	13	+ "and doc.space = :space"
	14	+).bindValue("space", $SPACE).execute().get(0))
19	19
20		-## текущая страница документов (новые сверху)
21		-#set($docs = $services.query.hql(
22		- "select doc.fullName from XWikiDocument doc " +
23		- "where doc.fullName like :prefix " +
	16	+#set($posts = $services.query.hql(
	17	+ "select doc.fullName " +
	18	+ "from XWikiDocument doc, BaseObject o " +
	19	+ "where o.name = doc.fullName and o.className = 'Blog.BlogPostClass' " +
	20	+ "and doc.space = :space " +
24	24	"order by doc.date desc"
25		-).bindValue("prefix", $PREFIX + "%").setLimit($PERPAGE).setOffset($offset).execute())
	22	+).bindValue("space", $SPACE).setLimit($PERPAGE).setOffset($offset).execute())
26	26
27		-#foreach($fn in $docs)
	24	+#foreach($fn in $posts)
28	28	#set($d = $xwiki.getDocument($fn))
29		- <article style="margin:14px 0; padding-bottom:10px; border-bottom:1px solid #e5e7eb">
30		- <div style="color:#6b7280; font-size:.9em">$datetool.format('dd MMM yyyy', $d.date)</div>
	26	+ <article class="sl-blog-entry" style="margin:14px 0;padding-bottom:10px;border-bottom:1px solid #e5e7eb">
	27	+ <div style="color:#6b7280;font-size:.9em">$datetool.format('dd MMM yyyy', $d.date)</div>
31	31	<h3 style="margin:.2rem 0"><a href="$d.getURL('view')">$escapetool.html($d.displayTitle)</a></h3>
32	32	<div>$!d.getPlainContent().substring(0,300)…</div>
33	33	</article>
...	...	@@ -36,10 +36,10 @@
36	36	#if($total > $PERPAGE)
37	37	#set($pages = ($total + $PERPAGE - 1) / $PERPAGE)
38	38	#set($base = $doc.getURL('view'))
39		- <nav style="margin-top:1em; display:flex; gap:1em; align-items:center">
40		- #if($p > 1)<a href="$base?p=$math.sub($p,1)">← Назад</a>#else<span style="opacity:.5">← Назад</span>#end
41		- <span>Стр. $p / $pages</span>
42		- #if($p < $pages)<a href="$base?p=$math.add($p,1)">Далее →</a>#else<span style="opacity:.5">Далее →</span>#end
	36	+ <nav style="display:flex;gap:.75rem;align-items:center;margin-top:12px">
	37	+ #if($p > 1)<a href="$base?p=$math.sub($p,1)">← Назад</a>#else<span style="opacity:.45">← Назад</span>#end
	38	+ <span>$p / $pages</span>
	39	+ #if($p < $pages)<a href="$base?p=$math.add($p,1)">Далее →</a>#else<span style="opacity:.45">Далее →</span>#end
43	43	</nav>
44	44	#end
45	45	{{/velocity}}