Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

2014-04-27 19:12:27 +02:00
parent f7b57643ef 744d93b938
commit 4efba7e295
108 changed files with 964 additions and 1170 deletions
@@ -1,8 +1,12 @@
 {if $importForm}
    {if $die}
+        <h2>{$CONST.IMPORT_ENTRIES}</h2>
+
        <span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.INCLUDE_ERRORFAILURE|sprintf:'importer'}</span>
    {else}
        {if $validateData}
+        <h2>{$CONST.IMPORT_ENTRIES}</h2>
+
        <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.IMPORT_STARTING}</span>
            {if $result != true}
            <span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.IMPORT_FAILED}: {$result}</span>