From b52fcb62d1fe479c4149d31f68020f321070725b Mon Sep 17 00:00:00 2001 From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Sat, 18 Sep 2010 21:54:36 +0000 Subject: [PATCH] currentBaseUrl usage in templates --- Builder/IISMainHandler/build.txt | 2 +- templates/Full/AllPosts.xslt | 9 ++------- templates/Full/AllThreads.xslt | 5 +---- templates/Full/Board.xslt | 6 +----- templates/Full/BoardAsThread.xslt | 8 ++------ templates/Full/Conversation.xslt | 8 ++------ templates/Full/Conversations.xslt | 5 +---- templates/Full/Thread.xslt | 11 +++-------- templates/Full/UploadList.xslt | 8 ++------ templates/Full/UserList.xslt | 4 +--- templates/Full/UserPollsParticipated.xslt | 4 +--- templates/Full/UserPosts.xslt | 10 ++-------- templates/Full/UserReplies.xslt | 10 ++-------- templates/Full/UserThreads.xslt | 6 +----- templates/Full/elems/Header.xslt | 2 +- templates/Full/elems/Main.xslt | 4 +++- templates/Lite/Board.xslt | 4 +--- templates/Lite/BoardAsThread.xslt | 4 +--- templates/Lite/Conversation.xslt | 8 ++------ templates/Lite/Conversations.xslt | 4 +--- templates/Lite/Thread.xslt | 4 +--- templates/Lite/elems/Main.xslt | 4 +++- 22 files changed, 35 insertions(+), 95 deletions(-) diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index a993081..ca12c17 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1398 \ No newline at end of file +1404 \ No newline at end of file diff --git a/templates/Full/AllPosts.xslt b/templates/Full/AllPosts.xslt index 92e2986..7206bf0 100644 --- a/templates/Full/AllPosts.xslt +++ b/templates/Full/AllPosts.xslt @@ -6,7 +6,6 @@ Все сообщения true - /AllPosts/ @@ -40,9 +39,7 @@
страницы: - - /AllPosts/ - +
@@ -55,9 +52,7 @@ страницы: - - /AllPosts/ - + diff --git a/templates/Full/AllThreads.xslt b/templates/Full/AllThreads.xslt index f8c8916..ee3c20e 100644 --- a/templates/Full/AllThreads.xslt +++ b/templates/Full/AllThreads.xslt @@ -6,7 +6,6 @@ Все темы
true - /AllThreads/ @@ -48,9 +47,7 @@ diff --git a/templates/Full/Board.xslt b/templates/Full/Board.xslt index 68a8104..518862a 100644 --- a/templates/Full/Board.xslt +++ b/templates/Full/Board.xslt @@ -8,8 +8,6 @@ truetrue - /Board// -
страницы: - - /AllThreads/ - +
@@ -127,9 +125,7 @@ diff --git a/templates/Full/BoardAsThread.xslt b/templates/Full/BoardAsThread.xslt index cc7e735..0bacf36 100644 --- a/templates/Full/BoardAsThread.xslt +++ b/templates/Full/BoardAsThread.xslt @@ -100,9 +100,7 @@ @@ -113,9 +111,7 @@ diff --git a/templates/Full/Conversation.xslt b/templates/Full/Conversation.xslt index 650e68e..a70ebfc 100644 --- a/templates/Full/Conversation.xslt +++ b/templates/Full/Conversation.xslt @@ -19,9 +19,7 @@
страницы: - - - +
страницы: - - /BoardAsThread// - +
страницы: - - /BoardAsThread// - +
страницы: - - /My/Conversations/Conversation// - +
@@ -34,9 +32,7 @@ страницы: - - /My/Conversations/Conversation// - + diff --git a/templates/Full/Conversations.xslt b/templates/Full/Conversations.xslt index 5a444ba..65305ff 100644 --- a/templates/Full/Conversations.xslt +++ b/templates/Full/Conversations.xslt @@ -5,7 +5,6 @@ Личные сообщения true true - /My/Conversations/ @@ -81,9 +80,7 @@ diff --git a/templates/Full/Thread.xslt b/templates/Full/Thread.xslt index bb695e1..0d639ec 100644 --- a/templates/Full/Thread.xslt +++ b/templates/Full/Thread.xslt @@ -7,8 +7,7 @@ truetrue - /Thread// - 0/reversed + 0/reversed @@ -24,9 +23,7 @@
страницы: - - /My/Conversations/ - +
страницы: - - - +
@@ -41,9 +38,7 @@ страницы: - - - + diff --git a/templates/Full/UploadList.xslt b/templates/Full/UploadList.xslt index 3f6346d..49e11f2 100644 --- a/templates/Full/UploadList.xslt +++ b/templates/Full/UploadList.xslt @@ -14,9 +14,7 @@ страницы: - - /Upload/List/ - + @@ -29,9 +27,7 @@ страницы: - - /Upload/List/ - + diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt index 2afd5e6..086ca9c 100644 --- a/templates/Full/UserList.xslt +++ b/templates/Full/UserList.xslt @@ -42,9 +42,7 @@ страницы: - - /Users/All/ - + diff --git a/templates/Full/UserPollsParticipated.xslt b/templates/Full/UserPollsParticipated.xslt index 6a75cb9..9d48b9e 100644 --- a/templates/Full/UserPollsParticipated.xslt +++ b/templates/Full/UserPollsParticipated.xslt @@ -20,9 +20,7 @@ страницы: - - /Users/User//PollsParticipated/ - + diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt index 106b59b..91f323f 100644 --- a/templates/Full/UserPosts.xslt +++ b/templates/Full/UserPosts.xslt @@ -7,8 +7,6 @@
true - /Users/User//Posts/ - @@ -20,9 +18,7 @@
страницы: - - - +
@@ -35,9 +31,7 @@ страницы: - - - + diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt index aa4d96c..354ba76 100644 --- a/templates/Full/UserReplies.xslt +++ b/templates/Full/UserReplies.xslt @@ -7,8 +7,6 @@
true - /Users/User//Replies/ - @@ -20,9 +18,7 @@
страницы: - - - +
@@ -35,9 +31,7 @@ страницы: - - - + diff --git a/templates/Full/UserThreads.xslt b/templates/Full/UserThreads.xslt index 6484a31..1331321 100644 --- a/templates/Full/UserThreads.xslt +++ b/templates/Full/UserThreads.xslt @@ -7,8 +7,6 @@
true - /Users/User//Threads/ - @@ -26,9 +24,7 @@ diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt index 6a5658d..91b4ad8 100644 --- a/templates/Full/elems/Header.xslt +++ b/templates/Full/elems/Header.xslt @@ -6,7 +6,7 @@ falsefalse - + diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt index 6cc18c1..08faf3b 100644 --- a/templates/Full/elems/Main.xslt +++ b/templates/Full/elems/Main.xslt @@ -231,7 +231,9 @@ - + + + diff --git a/templates/Lite/Board.xslt b/templates/Lite/Board.xslt index 5ea0de7..6840833 100644 --- a/templates/Lite/Board.xslt +++ b/templates/Lite/Board.xslt @@ -33,9 +33,7 @@ diff --git a/templates/Lite/BoardAsThread.xslt b/templates/Lite/BoardAsThread.xslt index 35626e7..5c1cbe2 100644 --- a/templates/Lite/BoardAsThread.xslt +++ b/templates/Lite/BoardAsThread.xslt @@ -93,9 +93,7 @@
страницы: - - /BoardAsThread// - +
diff --git a/templates/Lite/Conversation.xslt b/templates/Lite/Conversation.xslt index 216a535..ba4ff84 100644 --- a/templates/Lite/Conversation.xslt +++ b/templates/Lite/Conversation.xslt @@ -18,9 +18,7 @@
страницы: - - - +
страницы: - - /Board// - +
страницы: - - /My/Conversations/Conversation// - +
@@ -33,9 +31,7 @@ страницы: - - /My/Conversations/Conversation// - + diff --git a/templates/Lite/Conversations.xslt b/templates/Lite/Conversations.xslt index 9dcddd7..2423d6b 100644 --- a/templates/Lite/Conversations.xslt +++ b/templates/Lite/Conversations.xslt @@ -26,9 +26,7 @@ страницы: - - /My/Conversations/ - + diff --git a/templates/Lite/Thread.xslt b/templates/Lite/Thread.xslt index 9b56194..dcc622c 100644 --- a/templates/Lite/Thread.xslt +++ b/templates/Lite/Thread.xslt @@ -9,9 +9,7 @@
страницы: - - /Thread// - +
diff --git a/templates/Lite/elems/Main.xslt b/templates/Lite/elems/Main.xslt index 6ef7637..52c0d45 100644 --- a/templates/Lite/elems/Main.xslt +++ b/templates/Lite/elems/Main.xslt @@ -154,7 +154,9 @@
- + + +