Сайт кафедры теоретической механики и сопротивления материалов УДХТУ

Изменения документа Теги

Редактировал(а) Dmitry Fedin 2014/10/22 14:26
От версии Icon 7.1
отредактировано Dmitry Fedin
на 2014/10/22 14:26
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-tag-ui-6.2.2]
К версии Icon 6.1 Icon
отредактировано Dmitry Fedin
на 2013/01/07 22:57
Изменить комментарий: Импортировано из XAR

Комментарий

Подробности

Icon Свойства страницы
Название
... ... @@ -1,1 +1,1 @@
1 -$services.localization.render("xe.tag.tags")
1 +$msg.get("xe.tag.tags")
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 2.1
1 +XWiki 2.0
Скрытые
... ... @@ -1,1 +1,1 @@
1 -true
1 +false
Содержимое
... ... @@ -8,121 +8,123 @@
8 8  ## - Delete a tag.
9 9  ##
10 10  $xwiki.ssx.use('Main.Tags')##
11 +$xwiki.ssx.use('Main.Dashboard')##
11 11  ##
12 12  ## Set application variables (action and tag) from URL parameters.
13 13  ##
14 -#set ($do = "$!{request.get('do')}")
15 -#set ($tag = "$!{request.get('tag')}")
16 -#set ($urlEscapedTag = $escapetool.url($tag))
17 -#set ($htmlEscapedTag = $escapetool.xml($tag))
15 +#set($do = "$!{request.get('do')}")
16 +#set($tag = "$!{request.get('tag')}")
17 +#set($urlEscapedTag = $escapetool.url($tag))
18 +#set($htmlEscapedTag = $escapetool.xml($tag))
18 18  ##
19 19  ## Macro displayTagAppTitle. Display level1 title of this app.
20 20  ##
21 -#macro (displayTagAppTitle $urlEscapedTag $htmlEscapedTag $displayButtons)
22 - (% class="xapp" %)
23 - = (% class="highlight tag" %)${tag}##
24 - #if ($xwiki.hasAdminRights() && $displayButtons) ##
25 - [[$services.localization.render('xe.tag.rename.link')>>||queryString="do=prepareRename&tag=${urlEscapedTag}" class="button rename" rel="nofollow"]] [[$services.localization.render('xe.tag.delete.link')>>||queryString="do=prepareDelete&tag=${urlEscapedTag}" class="button delete" rel="nofollow"]]##
22 +#macro(displayTagAppTitle $urlEscapedTag $htmlEscapedTag $displayButtons)
23 + <h1 class="xapp">
24 + <span class="highlight tag">
25 + <a href="$doc.getURL('view', "do=viewTag&amp;tag=${urlEscapedTag}")">$htmlEscapedTag</a>
26 + #if($xwiki.hasAdminRights() && $displayButtons)
27 + <a href="$doc.getURL('view', "do=prepareRename&amp;tag=${urlEscapedTag}")" class="button rename" rel="nofollow">Rename</a>&nbsp;<a href="$doc.getURL('view', "do=prepareDelete&amp;tag=${urlEscapedTag}")" class="button delete" rel="nofollow">Delete</a>
26 26   #end
27 - (%%) =
29 + </span>
30 + </h1>
28 28  #end
29 29  ##
30 30  ## Switch between all possible actions:
31 31  ## viewTag, prepareRename, rename, prepareDelete, delete, default (Tag cloud)
32 32  ##
33 -#if ($do == 'viewTag')
36 +{{html wiki=true}}
37 +#if($do == 'viewTag')
34 34   ##
35 35   ## View tag
36 36   ##
37 37   #displayTagAppTitle($urlEscapedTag $htmlEscapedTag true)
38 - #if ("$!{request.get('renamedTag')}" != '')
39 - {{info}}$services.localization.render('xe.tag.rename.success', ["//${request.get('renamedTag')}//"]){{/info}}
40 -
42 + #if("$!{request.get('renamedTag')}" != '')
43 + #set($htmlEscapedRenamedTag = $escapetool.xml($request.get('renamedTag')))
44 + #info($msg.get('xe.tag.rename.success', [$htmlEscapedRenamedTag]))
41 41   #end
42 - #set ($list = $xwiki.tag.getDocumentsWithTag($tag))
43 - {{container layoutStyle="columns"}}
44 - (((
45 - (% class="xapp" %)
46 - === $services.localization.render('xe.tag.alldocs', ["//${tag}//"]) ===
47 -
48 - #if ($list.size()> 0)
49 - {{html}}#displayDocumentList($list true $blacklistedSpaces){{/html}}
50 - #else
51 - (% class='noitems' %)$services.localization.render('xe.tag.notags')
52 - #end
53 - )))
54 - (((
55 - (% class="xapp" %)
56 - === $services.localization.render('xe.tag.activity', ["//${tag}//"]) ===
57 -
58 - {{activity tags="$tag" rss='true'/}}
59 - )))
60 - {{/container}}
61 -#elseif ($do == 'prepareRename')
46 + #set($list = $xwiki.tag.getDocumentsWithTag($tag))
47 + <div>
48 + <div id="dashboardleft">
49 + <div id="dashboardleftcontent">
50 + <h3 class="xapp"><span>$msg.get('xe.tag.alldocs', [$htmlEscapedTag])</span></h3>
51 + #displayDocumentList($list true $blacklistedSpaces)
52 + </div>
53 + </div>
54 + <div id="dashboardright">
55 + <div id="dashboardrightcontent">
56 + <h3 class="xapp"><span>$msg.get("xe.tag.activity", [$htmlEscapedTag])</span></h3>
57 +
58 + {{activity tags="$htmlEscapedTag" /}}
59 +
60 + </div>
61 + </div>
62 + <div style="clear:both; margin-bottom: 40px;"></div>
63 +</div>
64 +#elseif($do == 'prepareRename')
62 62   ##
63 63   ## Prepare rename tag
64 64   ##
65 65   #displayTagAppTitle($urlEscapedTag $htmlEscapedTag false)
66 -{{html}}
67 67   <form id="renameForm" action="$doc.getURL()" method="post">
68 68   <div>
69 69   <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
70 70   <input name="do" type="hidden" value="renameTag" />
71 71   <input name="tag" type="hidden" value="$htmlEscapedTag" />
72 - $services.localization.render('xe.tag.rename.renameto', [$htmlEscapedTag]) <input type="text" name="renameTo" /> <span class="buttonwrapper"><input type="submit" value="$services.localization.render('xe.tag.rename')" class="button"/></span><span class="buttonwrapper"><a href="$doc.getURL('view', "do=viewTag&tag=${urlEscapedTag}")" class="secondary button">$services.localization.render('cancel')</a></span>
74 + $msg.get('xe.tag.rename.renameto', [$htmlEscapedTag]) <input type="text" name="renameTo" /> <span class="buttonwrapper"><input type="submit" value="$msg.get('xe.tag.rename')" class="button"/></span>
73 73   </div>
74 74   </form>
75 -{{/html}}
76 -#elseif ($do == 'renameTag')
77 +#elseif($do == 'renameTag')
77 77   ##
78 78   ## Rename tag
79 79   ##
80 - #set ($renameTo = "$!{request.get('renameTo')}")
81 - #set ($success = false)
81 + #set($renameTo = "$!{request.get('renameTo')}")
82 + #set($success = false)
82 82   #if ($renameTo != '')
83 - #set ($success = $xwiki.tag.renameTag($tag, $renameTo))
84 + #set($success = $xwiki.tag.renameTag($tag, $renameTo))
84 84   #end
85 85   #if ($success == true || $success == 'OK')
86 - #set ($urlEscapedRenameTo = $escapetool.url($renameTo))
87 + #set($urlEscapedRenameTo = $escapetool.url($renameTo))
87 87   $response.sendRedirect($doc.getURL('view', "do=viewTag&tag=${urlEscapedRenameTo}&renamedTag=${urlEscapedTag}"))
88 88   #else
89 - {{error}}$services.localization.render('xe.tag.rename.failure', ["//${tag}//", "//${renameTo}//"]){{/error}}
90 + #set($htmlEscapedRenameTo = $escapetool.xml($renameTo))
91 + #error($msg.get('xe.tag.rename.failure', [$htmlEscapedTag, $htmlEscapedRenameTo]))
90 90   #end
91 -#elseif ($do == 'prepareDelete')
93 +#elseif($do == 'prepareDelete')
92 92   ##
93 93   ## Prepare delete tag
94 94   ##
95 95   #displayTagAppTitle($urlEscapedTag $htmlEscapedTag false)
96 -{{html}}
97 97   <form id="deleteForm" action="$doc.getURL()" method="post">
98 98   <div>
99 99   <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
100 100   <input name="do" type="hidden" value="deleteTag" />
101 101   <input name="tag" type="hidden" value="$htmlEscapedTag" />
102 - <span class="buttonwrapper"><input type="submit" value="$services.localization.render('xe.tag.delete', [$htmlEscapedTag])" class="button"/></span><span class="buttonwrapper"><a href="$doc.getURL('view', "do=viewTag&tag=${urlEscapedTag}")" class="secondary button">$services.localization.render('cancel')</a></span>
103 + <span class="buttonwrapper"><input type="submit" value="$msg.get('xe.tag.delete', [$htmlEscapedTag])" class="button"/></span>
103 103   </div>
104 104   </form>
105 -{{/html}}
106 -#elseif ($do == 'deleteTag')
106 +#elseif($do == 'deleteTag')
107 107   ##
108 108   ## Delete tag
109 109   ##
110 - #set ($success = $xwiki.tag.deleteTag($tag))
110 + #set($success = $xwiki.tag.deleteTag($tag))
111 111   #if ($success == true || $success == 'OK')
112 112   $response.sendRedirect($doc.getURL('view', "deletedTag=${urlEscapedTag}"))
113 113   #else
114 - {{error}}$services.localization.render('xe.tag.delete.failure', ["//${tag}//"]){{/error}}
114 + #error($msg.get('xe.tag.delete.failure', [$htmlEscapedTag]))
115 115   #end
116 116  #else
117 117   ##
118 118   ## View all tags (Tag Cloud)
119 119   ##
120 - #set ($title = 'All Tags')
121 - #if ("$!{request.get('deletedTag')}" != '')
122 - {{info}}$services.localization.render('xe.tag.delete.success', ["//${request.get('deletedTag')}//"]){{/info}}
123 -
120 + #set($tags = $xwiki.tag.getTags(true))
121 + #set($title = 'All Tags')
122 + #if("$!{request.get('deletedTag')}" != '')
123 + #set($htmlEscapedTag = $escapetool.xml($request.get('deletedTag')))
124 + #info($msg.get('xe.tag.delete.success', [$htmlEscapedTag]))
124 124   #end
125 - {{tagcloud/}}
126 + #set($docextras = [])
127 + #includeInContext("XWiki.TagCloud")
126 126  #end
127 -#set ($displayDocExtra = false)
129 +{{/html}}
128 128  {{/velocity}}
Icon XWiki.StyleSheetExtension[0]
Код
... ... @@ -1,50 +3,67 @@
1 -#template('colorThemeInit.vm')
2 -
3 3  h1.xapp {
4 - border-bottom: 0 none;
5 - margin: 0;
2 + margin-bottom: 1em;
6 6  }
7 7  
8 -h1.xapp + form {
9 - margin: 1.5em 0 1em;
5 +h1.xapp span {
6 + border:0;
7 + margin-top:0;
8 + display: inline;
10 10  }
11 11  
12 -h1.xapp * {
13 - vertical-align: middle;
14 -}
15 -
16 -h1.xapp .highlight {
17 - background: url("$xwiki.getSkinFile('icons/silk/tag_blue.png')") no-repeat 5px 50% $theme.backgroundSecondaryColor;
18 - border: solid 1px $theme.borderColor;
19 - border-radius: 10px;
11 +h1.xapp span.highlight {
20 20   display: inline-block;
21 - font-weight: bold;
22 - padding: 2px 8px 2px 25px;
13 + background-color: lemonChiffon;
14 + border: solid 1px Gainsboro;
15 + font-weight:bold;
23 23   white-space: nowrap;
17 + padding: 2px 10px 0 25px;
18 + -moz-border-radius: 10px;
19 + -webkit-border-radius: 10px;
20 + border-radius: 10px;
21 + margin-bottom: -8px;
24 24  }
25 25  
26 -h1.xapp .button {
27 - background: no-repeat 3px 50% $theme.pageContentBackgroundColor;
28 - border: solid 1px $theme.borderColor;
29 - border-radius: 7px;
30 - color: $theme.linkColor;
31 - display : inline-block;
32 - font-size: 50%;
24 +h1.xapp span.tag {
25 + background: lemonChiffon url("$xwiki.getSkinFile('icons/silk/tag_blue.png')") no-repeat 5px 50%;
26 +}
27 +
28 +h1.xapp span.highlight a.button {
29 + font-size: 12px;
33 33   font-weight: normal;
34 - line-height: 1.5em;
35 - padding: 2px 5px 2px 20px;
31 + line-height: 18px;
32 + display : inline-block;
33 + background-color: lightYellow;
34 + border: solid 1px Gainsboro;
35 + -moz-border-radius: 10px;
36 + -webkit-border-radius: 10px;
37 + border-radius: 10px;
38 + padding: 2px 5px 0 5px;
39 + vertical-align: middle;
36 36  }
37 37  
38 -h1.xapp .delete {
39 - background-image: url("$xwiki.getSkinFile('icons/silk/cross.png')");
42 +h1.xapp span.highlight a.delete {
43 + background: lightYellow url("$xwiki.getSkinFile('icons/silk/cross.png')") no-repeat 3px 50%;
44 + padding: 2px 5px 0px 20px;
40 40  }
41 41  
42 -h1.xapp .rename {
43 - background-image: url("$xwiki.getSkinFile('icons/silk/textfield_rename.png')");
47 +h1.xapp span.highlight a.rename {
48 + background: lightYellow url("$xwiki.getSkinFile('icons/silk/textfield_rename.png')") no-repeat 3px 50%;
49 + padding: 2px 5px 0px 20px;
44 44  }
45 45  
46 -h1.xapp .button:hover {
47 - background-color: $theme.highlightColor;
52 +h1.xapp span.highlight a:hover.button {
53 + background-color: Lavender;
54 + border: solid 1px Gainsboro;
55 +}
56 +
57 +h1.xapp span.highlight span:hover.button a,
58 +h1.xapp span.highlight span:hover.button a:link,
59 +h1.xapp span.highlight span:hover.button a:active,
60 +h1.xapp span.highlight span:hover.button a:visited {
48 48   text-decoration: none;
49 49  }
50 50  
64 +h3.xapp span {
65 + margin:0;
66 +}
67 +