Изменения документа Сравнение XWiki и Confluence
Редактировал(а) Coluns 02.11.2024
Сводка
-
Свойства страницы (1 изменено, 0 добавлено, 0 удалено)
Подробности
- Свойства страницы
-
- Содержимое
-
... ... @@ -1,5 +1,33 @@ 1 1 (% class="box" %) 2 -((( На этой странице мы приводим сравнение **XWiki **с системой **Confluence** ))) 2 +((( 3 +(% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"info-circle~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 4 + 'public' : 'unlock', 5 + 'private' : 'lock', 6 + 'hidden' : 'eye-slash', 7 + 'matchable' : 'search', 8 + 'delete' : 'times' 9 +}) 10 +#set ($iconName = $xcontext.macro.params.name) 11 +#if ($aliases.containsKey($iconName)) 12 + #set ($iconName = $aliases.get($iconName)) 13 +#end 14 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 15 +#set ($iconSize = $xcontext.macro.params.size) 16 +#if ($iconSize == 'large') 17 + #set ($iconSize = 'lg') 18 +#end 19 +#if ($supportedSizes.contains($iconSize)) 20 + #set ($iconSize = ~"fa-$\{iconSize}~") 21 +#else 22 + #set ($iconSize = '') 23 +#end 24 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 25 +#set ($text = ~" $!\{xcontext.macro.content}~") 26 +## 27 +## Pull the Font Awesome style 28 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 29 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 30 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-info-circle" %) (%%) На этой странице мы приводим сравнение **XWiki **с системой **Confluence** 3 3 4 4 ---- 5 5 ... ... @@ -51,20 +51,215 @@ 51 51 (% style="width:100%" %) 52 52 |=(% style="width: 417px;" %)Функция|=(% style="width: 417px;" %)XWiki|=(% style="width: 436px;" %)Confluence|=(% style="width: 1107px;" %)Почему это важно? 53 53 |(% style="width:417px" %)Открытый исходный код|(% style="width:417px" %)((( 54 -(% style="color:#16a085" %) **НЕТ** 82 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 83 + 'public' : 'unlock', 84 + 'private' : 'lock', 85 + 'hidden' : 'eye-slash', 86 + 'matchable' : 'search', 87 + 'delete' : 'times' 88 +}) 89 +#set ($iconName = $xcontext.macro.params.name) 90 +#if ($aliases.containsKey($iconName)) 91 + #set ($iconName = $aliases.get($iconName)) 92 +#end 93 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 94 +#set ($iconSize = $xcontext.macro.params.size) 95 +#if ($iconSize == 'large') 96 + #set ($iconSize = 'lg') 97 +#end 98 +#if ($supportedSizes.contains($iconSize)) 99 + #set ($iconSize = ~"fa-$\{iconSize}~") 100 +#else 101 + #set ($iconSize = '') 102 +#end 103 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 104 +#set ($text = ~" $!\{xcontext.macro.content}~") 105 +## 106 +## Pull the Font Awesome style 107 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 108 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 109 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 110 +)))|(% style="width:436px" %)((( 111 +(% style="color:red" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"times~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 112 + 'public' : 'unlock', 113 + 'private' : 'lock', 114 + 'hidden' : 'eye-slash', 115 + 'matchable' : 'search', 116 + 'delete' : 'times' 117 +}) 118 +#set ($iconName = $xcontext.macro.params.name) 119 +#if ($aliases.containsKey($iconName)) 120 + #set ($iconName = $aliases.get($iconName)) 121 +#end 122 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 123 +#set ($iconSize = $xcontext.macro.params.size) 124 +#if ($iconSize == 'large') 125 + #set ($iconSize = 'lg') 126 +#end 127 +#if ($supportedSizes.contains($iconSize)) 128 + #set ($iconSize = ~"fa-$\{iconSize}~") 129 +#else 130 + #set ($iconSize = '') 131 +#end 132 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 133 +#set ($text = ~" $!\{xcontext.macro.content}~") 134 +## 135 +## Pull the Font Awesome style 136 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 137 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 138 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-times" %) (%%) **НЕТ** 55 55 )))|(% style="width:1107px" %)((( 56 56 Открытый исходный код защищает ваши инвестиции благодаря обратимости и расширяемости. 57 57 ))) 58 58 |(% style="width:417px" %)Лицензия|(% style="width:417px" %)[[LGPL>>https://ru.wikipedia.org/wiki/GNU_Lesser_General_Public_License]]|(% style="width:436px" %)Коммерческая / проприетарная|(% style="width:1107px" %) 59 59 |(% style="width:417px" %)Возможность установить на свой сервер|(% style="width:417px" %)((( 60 -(% style="color:#16a085" %) **НЕТ** 144 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 145 + 'public' : 'unlock', 146 + 'private' : 'lock', 147 + 'hidden' : 'eye-slash', 148 + 'matchable' : 'search', 149 + 'delete' : 'times' 150 +}) 151 +#set ($iconName = $xcontext.macro.params.name) 152 +#if ($aliases.containsKey($iconName)) 153 + #set ($iconName = $aliases.get($iconName)) 154 +#end 155 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 156 +#set ($iconSize = $xcontext.macro.params.size) 157 +#if ($iconSize == 'large') 158 + #set ($iconSize = 'lg') 159 +#end 160 +#if ($supportedSizes.contains($iconSize)) 161 + #set ($iconSize = ~"fa-$\{iconSize}~") 162 +#else 163 + #set ($iconSize = '') 164 +#end 165 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 166 +#set ($text = ~" $!\{xcontext.macro.content}~") 167 +## 168 +## Pull the Font Awesome style 169 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 170 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 171 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 172 +)))|(% style="width:436px" %)((( 173 +(% style="color:red" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"times~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 174 + 'public' : 'unlock', 175 + 'private' : 'lock', 176 + 'hidden' : 'eye-slash', 177 + 'matchable' : 'search', 178 + 'delete' : 'times' 179 +}) 180 +#set ($iconName = $xcontext.macro.params.name) 181 +#if ($aliases.containsKey($iconName)) 182 + #set ($iconName = $aliases.get($iconName)) 183 +#end 184 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 185 +#set ($iconSize = $xcontext.macro.params.size) 186 +#if ($iconSize == 'large') 187 + #set ($iconSize = 'lg') 188 +#end 189 +#if ($supportedSizes.contains($iconSize)) 190 + #set ($iconSize = ~"fa-$\{iconSize}~") 191 +#else 192 + #set ($iconSize = '') 193 +#end 194 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 195 +#set ($text = ~" $!\{xcontext.macro.content}~") 196 +## 197 +## Pull the Font Awesome style 198 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 199 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 200 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-times" %) (%%) **НЕТ** 61 61 )))|(% style="width:1107px" %)Такая возможность очень важна для бизнеса который хочет хранить в системе чувствительные данные и не хочет доверять их облачным решениям. 62 62 |(% style="width:417px" %)Облачное размещение|(% style="width:417px" %)((( 63 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 203 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 204 + 'public' : 'unlock', 205 + 'private' : 'lock', 206 + 'hidden' : 'eye-slash', 207 + 'matchable' : 'search', 208 + 'delete' : 'times' 209 +}) 210 +#set ($iconName = $xcontext.macro.params.name) 211 +#if ($aliases.containsKey($iconName)) 212 + #set ($iconName = $aliases.get($iconName)) 213 +#end 214 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 215 +#set ($iconSize = $xcontext.macro.params.size) 216 +#if ($iconSize == 'large') 217 + #set ($iconSize = 'lg') 218 +#end 219 +#if ($supportedSizes.contains($iconSize)) 220 + #set ($iconSize = ~"fa-$\{iconSize}~") 221 +#else 222 + #set ($iconSize = '') 223 +#end 224 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 225 +#set ($text = ~" $!\{xcontext.macro.content}~") 226 +## 227 +## Pull the Font Awesome style 228 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 229 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 230 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 231 +)))|(% style="width:436px" %)((( 232 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 233 + 'public' : 'unlock', 234 + 'private' : 'lock', 235 + 'hidden' : 'eye-slash', 236 + 'matchable' : 'search', 237 + 'delete' : 'times' 238 +}) 239 +#set ($iconName = $xcontext.macro.params.name) 240 +#if ($aliases.containsKey($iconName)) 241 + #set ($iconName = $aliases.get($iconName)) 242 +#end 243 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 244 +#set ($iconSize = $xcontext.macro.params.size) 245 +#if ($iconSize == 'large') 246 + #set ($iconSize = 'lg') 247 +#end 248 +#if ($supportedSizes.contains($iconSize)) 249 + #set ($iconSize = ~"fa-$\{iconSize}~") 250 +#else 251 + #set ($iconSize = '') 252 +#end 253 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 254 +#set ($text = ~" $!\{xcontext.macro.content}~") 255 +## 256 +## Pull the Font Awesome style 257 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 258 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 259 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 64 64 )))|(% style="width:1107px" %)Это может быть важно для организаций которые не имеют собственных мощностей для размещения системы или хотят вначале испыть систему в пилотном проекте. 65 65 |(% style="width:417px" %)Применение|(% style="width:417px" %)База знаний, Совместная работа для команд, Бизнес-приложения, Интранет, Экстранет, Общедоступный веб-сайт, Поддержка, Документация|(% style="width:436px" %)Вики для команд, база знаний, документация|(% style="width:1107px" %)Расширяемость XWiki позволит выйти за рамки простой вики и отвечать потребностям организации, включая возможность создавать общедоступные веб-сайты и общие инструменты совместной работы. 66 66 |(% style="width:417px" %)Брендирование|(% style="width:417px" %)((( 67 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 263 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 264 + 'public' : 'unlock', 265 + 'private' : 'lock', 266 + 'hidden' : 'eye-slash', 267 + 'matchable' : 'search', 268 + 'delete' : 'times' 269 +}) 270 +#set ($iconName = $xcontext.macro.params.name) 271 +#if ($aliases.containsKey($iconName)) 272 + #set ($iconName = $aliases.get($iconName)) 273 +#end 274 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 275 +#set ($iconSize = $xcontext.macro.params.size) 276 +#if ($iconSize == 'large') 277 + #set ($iconSize = 'lg') 278 +#end 279 +#if ($supportedSizes.contains($iconSize)) 280 + #set ($iconSize = ~"fa-$\{iconSize}~") 281 +#else 282 + #set ($iconSize = '') 283 +#end 284 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 285 +#set ($text = ~" $!\{xcontext.macro.content}~") 286 +## 287 +## Pull the Font Awesome style 288 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 289 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 290 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 68 68 )))|(% style="width:436px" %) |(% style="width:1107px" %)((( 69 69 Возможность изменить внешний вид системы так как необходимо. 70 70 ... ... @@ -74,13 +74,181 @@ 74 74 ))) 75 75 |(% style="width:417px" %)Стоимость|(% style="width:417px" %) |(% style="width:436px" %) |(% style="width:1107px" %)Стоимость указана за лицензии производителя. Администрирование и настройка не учитывались и предполагаются равными для всех вариантов. 76 76 |(% style="width:417px" %)Классические возможности wiki|(% style="width:417px" %)((( 77 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 300 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 301 + 'public' : 'unlock', 302 + 'private' : 'lock', 303 + 'hidden' : 'eye-slash', 304 + 'matchable' : 'search', 305 + 'delete' : 'times' 306 +}) 307 +#set ($iconName = $xcontext.macro.params.name) 308 +#if ($aliases.containsKey($iconName)) 309 + #set ($iconName = $aliases.get($iconName)) 310 +#end 311 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 312 +#set ($iconSize = $xcontext.macro.params.size) 313 +#if ($iconSize == 'large') 314 + #set ($iconSize = 'lg') 315 +#end 316 +#if ($supportedSizes.contains($iconSize)) 317 + #set ($iconSize = ~"fa-$\{iconSize}~") 318 +#else 319 + #set ($iconSize = '') 320 +#end 321 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 322 +#set ($text = ~" $!\{xcontext.macro.content}~") 323 +## 324 +## Pull the Font Awesome style 325 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 326 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 327 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 328 +)))|(% style="width:436px" %)((( 329 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 330 + 'public' : 'unlock', 331 + 'private' : 'lock', 332 + 'hidden' : 'eye-slash', 333 + 'matchable' : 'search', 334 + 'delete' : 'times' 335 +}) 336 +#set ($iconName = $xcontext.macro.params.name) 337 +#if ($aliases.containsKey($iconName)) 338 + #set ($iconName = $aliases.get($iconName)) 339 +#end 340 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 341 +#set ($iconSize = $xcontext.macro.params.size) 342 +#if ($iconSize == 'large') 343 + #set ($iconSize = 'lg') 344 +#end 345 +#if ($supportedSizes.contains($iconSize)) 346 + #set ($iconSize = ~"fa-$\{iconSize}~") 347 +#else 348 + #set ($iconSize = '') 349 +#end 350 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 351 +#set ($text = ~" $!\{xcontext.macro.content}~") 352 +## 353 +## Pull the Font Awesome style 354 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 355 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 356 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 78 78 )))|(% style="width:1107px" %)Оба решения предоставляют управление версиями страниц и файлов, шаблоны, права, поиск, обсуждения и т.д. 79 79 |(% style="width:417px" %)Редактор WYSIWYG|(% style="width:417px" %)((( 80 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 359 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 360 + 'public' : 'unlock', 361 + 'private' : 'lock', 362 + 'hidden' : 'eye-slash', 363 + 'matchable' : 'search', 364 + 'delete' : 'times' 365 +}) 366 +#set ($iconName = $xcontext.macro.params.name) 367 +#if ($aliases.containsKey($iconName)) 368 + #set ($iconName = $aliases.get($iconName)) 369 +#end 370 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 371 +#set ($iconSize = $xcontext.macro.params.size) 372 +#if ($iconSize == 'large') 373 + #set ($iconSize = 'lg') 374 +#end 375 +#if ($supportedSizes.contains($iconSize)) 376 + #set ($iconSize = ~"fa-$\{iconSize}~") 377 +#else 378 + #set ($iconSize = '') 379 +#end 380 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 381 +#set ($text = ~" $!\{xcontext.macro.content}~") 382 +## 383 +## Pull the Font Awesome style 384 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 385 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 386 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 387 +)))|(% style="width:436px" %)((( 388 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 389 + 'public' : 'unlock', 390 + 'private' : 'lock', 391 + 'hidden' : 'eye-slash', 392 + 'matchable' : 'search', 393 + 'delete' : 'times' 394 +}) 395 +#set ($iconName = $xcontext.macro.params.name) 396 +#if ($aliases.containsKey($iconName)) 397 + #set ($iconName = $aliases.get($iconName)) 398 +#end 399 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 400 +#set ($iconSize = $xcontext.macro.params.size) 401 +#if ($iconSize == 'large') 402 + #set ($iconSize = 'lg') 403 +#end 404 +#if ($supportedSizes.contains($iconSize)) 405 + #set ($iconSize = ~"fa-$\{iconSize}~") 406 +#else 407 + #set ($iconSize = '') 408 +#end 409 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 410 +#set ($text = ~" $!\{xcontext.macro.content}~") 411 +## 412 +## Pull the Font Awesome style 413 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 414 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 415 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 81 81 )))|(% style="width:1107px" %)Начиная с версии 8+, XWiki использует [[**CK Editor**>>https://ckeditor.com/]], один из лучших редакторов WYSIWYG с расширенными функциями. 82 82 |(% style="width:417px" %)Редактор синтаксиса Wiki|(% style="width:417px" %)((( 83 -(% style="color:#16a085" %) **НЕТ** 418 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 419 + 'public' : 'unlock', 420 + 'private' : 'lock', 421 + 'hidden' : 'eye-slash', 422 + 'matchable' : 'search', 423 + 'delete' : 'times' 424 +}) 425 +#set ($iconName = $xcontext.macro.params.name) 426 +#if ($aliases.containsKey($iconName)) 427 + #set ($iconName = $aliases.get($iconName)) 428 +#end 429 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 430 +#set ($iconSize = $xcontext.macro.params.size) 431 +#if ($iconSize == 'large') 432 + #set ($iconSize = 'lg') 433 +#end 434 +#if ($supportedSizes.contains($iconSize)) 435 + #set ($iconSize = ~"fa-$\{iconSize}~") 436 +#else 437 + #set ($iconSize = '') 438 +#end 439 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 440 +#set ($text = ~" $!\{xcontext.macro.content}~") 441 +## 442 +## Pull the Font Awesome style 443 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 444 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 445 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 446 +)))|(% style="width:436px" %)((( 447 +(% style="color:red" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"times~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 448 + 'public' : 'unlock', 449 + 'private' : 'lock', 450 + 'hidden' : 'eye-slash', 451 + 'matchable' : 'search', 452 + 'delete' : 'times' 453 +}) 454 +#set ($iconName = $xcontext.macro.params.name) 455 +#if ($aliases.containsKey($iconName)) 456 + #set ($iconName = $aliases.get($iconName)) 457 +#end 458 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 459 +#set ($iconSize = $xcontext.macro.params.size) 460 +#if ($iconSize == 'large') 461 + #set ($iconSize = 'lg') 462 +#end 463 +#if ($supportedSizes.contains($iconSize)) 464 + #set ($iconSize = ~"fa-$\{iconSize}~") 465 +#else 466 + #set ($iconSize = '') 467 +#end 468 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 469 +#set ($text = ~" $!\{xcontext.macro.content}~") 470 +## 471 +## Pull the Font Awesome style 472 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 473 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 474 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-times" %) (%%) **НЕТ** 84 84 )))|(% style="width:1107px" %)((( 85 85 Для продвинутых пользователей редактирование синтаксиса Wiki более эффективно, и при создании страниц для всеобщего обозрения это позволяет осуществлять детальный контроль над страницей. 86 86 ... ... @@ -89,7 +89,63 @@ 89 89 Это важно, так как хранение информации в "каноническом" формате, позволяет при необходимости сменить систему и упрощает интеграцию с другими приложениями. 90 90 ))) 91 91 |(% style="width:417px" %)Импорт / экспорт документов Office и средства просмотра Office / PDF|(% style="width:417px" %)((( 92 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 483 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 484 + 'public' : 'unlock', 485 + 'private' : 'lock', 486 + 'hidden' : 'eye-slash', 487 + 'matchable' : 'search', 488 + 'delete' : 'times' 489 +}) 490 +#set ($iconName = $xcontext.macro.params.name) 491 +#if ($aliases.containsKey($iconName)) 492 + #set ($iconName = $aliases.get($iconName)) 493 +#end 494 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 495 +#set ($iconSize = $xcontext.macro.params.size) 496 +#if ($iconSize == 'large') 497 + #set ($iconSize = 'lg') 498 +#end 499 +#if ($supportedSizes.contains($iconSize)) 500 + #set ($iconSize = ~"fa-$\{iconSize}~") 501 +#else 502 + #set ($iconSize = '') 503 +#end 504 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 505 +#set ($text = ~" $!\{xcontext.macro.content}~") 506 +## 507 +## Pull the Font Awesome style 508 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 509 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 510 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 511 +)))|(% style="width:436px" %)((( 512 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 513 + 'public' : 'unlock', 514 + 'private' : 'lock', 515 + 'hidden' : 'eye-slash', 516 + 'matchable' : 'search', 517 + 'delete' : 'times' 518 +}) 519 +#set ($iconName = $xcontext.macro.params.name) 520 +#if ($aliases.containsKey($iconName)) 521 + #set ($iconName = $aliases.get($iconName)) 522 +#end 523 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 524 +#set ($iconSize = $xcontext.macro.params.size) 525 +#if ($iconSize == 'large') 526 + #set ($iconSize = 'lg') 527 +#end 528 +#if ($supportedSizes.contains($iconSize)) 529 + #set ($iconSize = ~"fa-$\{iconSize}~") 530 +#else 531 + #set ($iconSize = '') 532 +#end 533 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 534 +#set ($text = ~" $!\{xcontext.macro.content}~") 535 +## 536 +## Pull the Font Awesome style 537 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 538 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 539 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 93 93 )))|(% style="width:1107px" %)((( 94 94 XWiki предлагает возможность импорта из различных форматов и синтаксисов, включая документы Microsoft Office. 95 95 ... ... @@ -100,10 +100,122 @@ 100 100 XAR - внутренний формат обмена между XWiki позволяет легко переносить информацию, логику и доработки между системами. Например разработка документации или приложений может вестись в тестовом контуре и легко переносится на продуктовую установку. 101 101 ))) 102 102 |(% style="width:417px" %)Аутентификация [[LDAP>>https://ru.wikipedia.org/wiki/LDAP]] / [[AD>>https://ru.wikipedia.org/wiki/Active_Directory]] / [[SSO>>https://ru.wikipedia.org/wiki/Технология_единого_входа]]|(% style="width:417px" %)((( 103 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 550 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 551 + 'public' : 'unlock', 552 + 'private' : 'lock', 553 + 'hidden' : 'eye-slash', 554 + 'matchable' : 'search', 555 + 'delete' : 'times' 556 +}) 557 +#set ($iconName = $xcontext.macro.params.name) 558 +#if ($aliases.containsKey($iconName)) 559 + #set ($iconName = $aliases.get($iconName)) 560 +#end 561 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 562 +#set ($iconSize = $xcontext.macro.params.size) 563 +#if ($iconSize == 'large') 564 + #set ($iconSize = 'lg') 565 +#end 566 +#if ($supportedSizes.contains($iconSize)) 567 + #set ($iconSize = ~"fa-$\{iconSize}~") 568 +#else 569 + #set ($iconSize = '') 570 +#end 571 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 572 +#set ($text = ~" $!\{xcontext.macro.content}~") 573 +## 574 +## Pull the Font Awesome style 575 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 576 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 577 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 578 +)))|(% style="width:436px" %)((( 579 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 580 + 'public' : 'unlock', 581 + 'private' : 'lock', 582 + 'hidden' : 'eye-slash', 583 + 'matchable' : 'search', 584 + 'delete' : 'times' 585 +}) 586 +#set ($iconName = $xcontext.macro.params.name) 587 +#if ($aliases.containsKey($iconName)) 588 + #set ($iconName = $aliases.get($iconName)) 589 +#end 590 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 591 +#set ($iconSize = $xcontext.macro.params.size) 592 +#if ($iconSize == 'large') 593 + #set ($iconSize = 'lg') 594 +#end 595 +#if ($supportedSizes.contains($iconSize)) 596 + #set ($iconSize = ~"fa-$\{iconSize}~") 597 +#else 598 + #set ($iconSize = '') 599 +#end 600 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 601 +#set ($text = ~" $!\{xcontext.macro.content}~") 602 +## 603 +## Pull the Font Awesome style 604 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 605 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 606 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 104 104 )))|(% style="width:1107px" %) 105 105 |(% style="width:417px" %)Разграничение прав доступа к страницам|(% style="width:417px" %)((( 106 -(% style="color:#16a085" %) (% style="color:green" %) **ДА** 609 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 610 + 'public' : 'unlock', 611 + 'private' : 'lock', 612 + 'hidden' : 'eye-slash', 613 + 'matchable' : 'search', 614 + 'delete' : 'times' 615 +}) 616 +#set ($iconName = $xcontext.macro.params.name) 617 +#if ($aliases.containsKey($iconName)) 618 + #set ($iconName = $aliases.get($iconName)) 619 +#end 620 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 621 +#set ($iconSize = $xcontext.macro.params.size) 622 +#if ($iconSize == 'large') 623 + #set ($iconSize = 'lg') 624 +#end 625 +#if ($supportedSizes.contains($iconSize)) 626 + #set ($iconSize = ~"fa-$\{iconSize}~") 627 +#else 628 + #set ($iconSize = '') 629 +#end 630 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 631 +#set ($text = ~" $!\{xcontext.macro.content}~") 632 +## 633 +## Pull the Font Awesome style 634 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 635 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 636 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 637 +)))|(% style="width:436px" %)((( 638 +(% style="color:#16a085" %) (% contenteditable="false" tabindex="-1" data-macro="startmacro:icon|-|name=~"check~"|-|" data-widget="xwiki-macro" class="macro hidden macro-placeholder" %)макрос:icon(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-|output=~"false~"|-|#set ($aliases = \{ 639 + 'public' : 'unlock', 640 + 'private' : 'lock', 641 + 'hidden' : 'eye-slash', 642 + 'matchable' : 'search', 643 + 'delete' : 'times' 644 +}) 645 +#set ($iconName = $xcontext.macro.params.name) 646 +#if ($aliases.containsKey($iconName)) 647 + #set ($iconName = $aliases.get($iconName)) 648 +#end 649 +#set ($supportedSizes = ['lg', '2x', '3x', '4x']) 650 +#set ($iconSize = $xcontext.macro.params.size) 651 +#if ($iconSize == 'large') 652 + #set ($iconSize = 'lg') 653 +#end 654 +#if ($supportedSizes.contains($iconSize)) 655 + #set ($iconSize = ~"fa-$\{iconSize}~") 656 +#else 657 + #set ($iconSize = '') 658 +#end 659 +#set ($cssClass = $xcontext.macro.params.cssClass.replaceAll('~"', '\\~"')) 660 +#set ($text = ~" $!\{xcontext.macro.content}~") 661 +## 662 +## Pull the Font Awesome style 663 +$xwiki.linkx.use('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', \{'rel': 'stylesheet'}) 664 +$xwiki.ssx.use('XWiki.FontAwesomeIcons') 665 +##" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro hidden macro-placeholder" %)макрос:velocity(% contenteditable="false" tabindex="-1" data-widget="xwiki-macro" data-macro="startmacro:velocity|-||-|(% class=~"fa fa-$!iconName $!iconSize $!cssClass~" title=~"$!\{xcontext.macro.params.title}~"~%)$!\{text}(%~%)" class="macro macro fa fa-check" %) (% style="color:green" %) **ДА** 107 107 )))|(% style="width:1107px" %)((( 108 108 Возможность ограничить доступ к отдельным страницам различным пользователям или группам. 109 109