diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl index ce7abdcc..ba4f8f58 100644 --- a/templates/2k11/admin/category.inc.tpl +++ b/templates/2k11/admin/category.inc.tpl @@ -172,7 +172,7 @@
  • - {$category.category_name|escape:"html"} + {$category.category_name|escape:"html"}
    {if $category.category_description != ''} @@ -184,7 +184,7 @@
    diff --git a/templates/2k11/admin/comments.inc.tpl b/templates/2k11/admin/comments.inc.tpl index ef69338e..f272eb9b 100644 --- a/templates/2k11/admin/comments.inc.tpl +++ b/templates/2k11/admin/comments.inc.tpl @@ -144,14 +144,14 @@
    {$comment.fullBody}
      -
    • {$CONST.VIEW}
      • +
    • {$CONST.VIEW}
    • {$CONST.EDIT}
    • {$CONST.REPLY}
      • {if ($comment.status == 'pending') || ($comment.status == 'confirm')} -
    • {$CONST.APPROVE}
      • +
    • {$CONST.APPROVE}
      • {/if} {if ($comment.status == 'approved')} -
    • {$CONST.SET_TO_MODERATED}
      • +
    • {$CONST.SET_TO_MODERATED}
      • {/if}
    • {$CONST.DELETE}
      • diff --git a/templates/2k11/admin/entries.inc.tpl b/templates/2k11/admin/entries.inc.tpl index 280840af..24585599 100644 --- a/templates/2k11/admin/entries.inc.tpl +++ b/templates/2k11/admin/entries.inc.tpl @@ -141,9 +141,9 @@
        {if $entry.preview || (!$showFutureEntries && ($entry.timestamp >= $serverOffsetHour))} -
      • {$CONST.PREVIEW}
        • +
      • {$CONST.PREVIEW}
        • {else} -
      • {$CONST.VIEW}
        • +
      • {$CONST.VIEW}
        • {/if}
      • {$CONST.EDIT}
      • {$CONST.DELETE}
        • diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl index 858f6471..1047704f 100644 --- a/templates/2k11/admin/entries.tpl +++ b/templates/2k11/admin/entries.tpl @@ -36,7 +36,7 @@
        - Select category {* i18n *} + Select category {* i18n *}
        diff --git a/templates/2k11/admin/font/fontello.eot b/templates/2k11/admin/font/fontello.eot index 9de65599..faea1401 100644 Binary files a/templates/2k11/admin/font/fontello.eot and b/templates/2k11/admin/font/fontello.eot differ diff --git a/templates/2k11/admin/font/fontello.svg b/templates/2k11/admin/font/fontello.svg index 0642886b..d071936b 100644 --- a/templates/2k11/admin/font/fontello.svg +++ b/templates/2k11/admin/font/fontello.svg @@ -1,47 +1,48 @@ -Copyright (C) 2012 by original authors @ fontello.com +Copyright (C) 2014 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/2k11/admin/font/fontello.ttf b/templates/2k11/admin/font/fontello.ttf index a73f2164..8d59aab3 100644 Binary files a/templates/2k11/admin/font/fontello.ttf and b/templates/2k11/admin/font/fontello.ttf differ diff --git a/templates/2k11/admin/font/fontello.woff b/templates/2k11/admin/font/fontello.woff index 7e931995..4297c4a9 100644 Binary files a/templates/2k11/admin/font/fontello.woff and b/templates/2k11/admin/font/fontello.woff differ diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl index fc562089..05d6b8dc 100644 --- a/templates/2k11/admin/overview.inc.tpl +++ b/templates/2k11/admin/overview.inc.tpl @@ -33,10 +33,10 @@
      • {$CONST.EDIT}
      • {$CONST.REPLY}
        • {if ($comment.status == 'pending') || ($comment.status == 'confirm')} -
      • {$CONST.APPROVE}
        • +
      • {$CONST.APPROVE}
        • {/if} {if ($comment.status == 'approved')} -
      • {$CONST.SET_TO_MODERATED}
        • +
      • {$CONST.SET_TO_MODERATED}
        • {/if}
      • {$CONST.DELETE}
        • @@ -61,7 +61,7 @@
      • {$entry.title}
          -
        • {$CONST.PREVIEW}
          • +
        • {$CONST.PREVIEW}
        • {$CONST.EDIT}
          • {if $entry.isdraft == "true"}
        • diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css index aa9de88b..ce07308c 100644 --- a/templates/2k11/admin/style.css +++ b/templates/2k11/admin/style.css @@ -342,11 +342,11 @@ nav ol { ----------------------------------------------------------------- */ @font-face { font-family: 'fontello'; - src: url('{TEMPLATE_PATH}font/fontello.eot?87733287'); - src: url('{TEMPLATE_PATH}font/fontello.eot?87733287#iefix') format('embedded-opentype'), - url('{TEMPLATE_PATH}font/fontello.woff?87733287') format('woff'), - url('{TEMPLATE_PATH}font/fontello.ttf?87733287') format('truetype'), - url('{TEMPLATE_PATH}font/fontello.svg?87733287#fontello') format('svg'); + src: url('{TEMPLATE_PATH}font/fontello.eot?59044574'); + src: url('{TEMPLATE_PATH}font/fontello.eot?59044574#iefix') format('embedded-opentype'), + url('{TEMPLATE_PATH}font/fontello.woff?59044574') format('woff'), + url('{TEMPLATE_PATH}font/fontello.ttf?59044574') format('truetype'), + url('{TEMPLATE_PATH}font/fontello.svg?59044574#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -368,42 +368,43 @@ nav ol { line-height: 1em; } -.icon-plus:before { content: '\e805'; } -.icon-minus:before { content: '\e806'; } -.icon-home:before { content: '\e800'; } -.icon-attention:before { content: '\e802'; } -.icon-cog-alt:before { content: '\e801'; } -.icon-edit:before { content: '\e803'; } +.icon-search:before { content: '\e81f'; } +.icon-medkit:before { content: '\e823'; } +.icon-users:before { content: '\e81d'; } +.icon-picture:before { content: '\e81b'; } .icon-ok-circled:before { content: '\e804'; } .icon-cancel:before { content: '\e811'; } -.icon-ccw:before { content: '\e808'; } -.icon-cw:before { content: '\e807'; } +.icon-plus:before { content: '\e805'; } +.icon-minus:before { content: '\e806'; } .icon-help-circled:before { content: '\e809'; } .icon-info-circled:before { content: '\e80a'; } +.icon-home:before { content: '\e800'; } +.icon-thumbs-up-alt:before { content: '\e825'; } +.icon-thumbs-down-alt:before { content: '\e826'; } +.icon-edit:before { content: '\e803'; } .icon-chat:before { content: '\e80c'; } +.icon-attention:before { content: '\e802'; } .icon-trash:before { content: '\e80d'; } +.icon-folder-open:before { content: '\e81e'; } +.icon-user:before { content: '\e81c'; } +.icon-menu:before { content: '\e819'; } +.icon-cog-alt:before { content: '\e801'; } .icon-logout:before { content: '\e80f'; } +.icon-clock:before { content: '\e822'; } .icon-resize-full:before { content: '\e818'; } -.icon-zoom-in:before { content: '\e80b'; } +.icon-resize-full-alt:before { content: '\e80e'; } +.icon-move:before { content: '\e810'; } .icon-down-open:before { content: '\e816'; } .icon-left-open:before { content: '\e813'; } .icon-right-open:before { content: '\e814'; } .icon-up-open:before { content: '\e815'; } -.icon-move:before { content: '\e810'; } -.icon-rss:before { content: '\e812'; } -.icon-filter:before { content: '\e817'; } -.icon-resize-full-alt:before { content: '\e80e'; } -.icon-menu:before { content: '\e819'; } -.icon-sort:before { content: '\e81a'; } -.icon-medkit:before { content: '\e823'; } -.icon-picture:before { content: '\e81b'; } +.icon-cw:before { content: '\e807'; } +.icon-ccw:before { content: '\e808'; } .icon-globe:before { content: '\e821'; } -.icon-user:before { content: '\e81c'; } -.icon-users:before { content: '\e81d'; } -.icon-folder-open:before { content: '\e81e'; } -.icon-lock:before { content: '\e81f'; } -.icon-lock-open:before { content: '\e820'; } -.icon-clock:before { content: '\e822'; } +.icon-list-bullet:before { content: '\e824'; } +.icon-filter:before { content: '\e817'; } +.icon-sort:before { content: '\e81a'; } +.icon-rss:before { content: '\e812'; } /* BACKEND HELPER CLASSES diff --git a/templates/2k11/admin/users.inc.tpl b/templates/2k11/admin/users.inc.tpl index 88e068dc..c2b814a5 100644 --- a/templates/2k11/admin/users.inc.tpl +++ b/templates/2k11/admin/users.inc.tpl @@ -47,7 +47,7 @@ {$user.realname|escape:"html"} ({$user.userlevel_name|escape:'html'})