Merge pull request #2 from getgrav/develop

Release 0.4.1
getgrav · Aug 25, 2015 · beaef69 · beaef69
2 parents d64ef15 + 803a623
commit beaef69
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v0.4.1
+## 08/24/2015
+
+1. [](#bugfix)
+    * Fix for broken **Add Page** - Doh!
+    * Fix for empty site link when at root
+
 # v0.4.0
 ## 08/24/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 0.4.0
+version: 0.4.1
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

diff --git a/languages.yaml b/languages.yaml
@@ -207,10 +207,6 @@ en:
     DELIMITER_HELP: "The summary delimiter (default '===')"
     METADATA: Metadata
     METADATA_HELP: "Default metadata values that will be displayed on every page unless overridden by the page"
-    METADATA_KEY: "Key (e.g. 'Keywords')"
-    METADATA_VALUE: "Value (e.g. 'Blog, Grav')"
-    NAME: Key
-    CONTENT: Value
     REDIRECTS_AND_ROUTES: Redirects & Routes
     CUSTOM_REDIRECTS: Custom Redirects
     CUSTOM_REDIRECTS_HELP: "routes to redirect to other pages. Standard Regex replacement is valid"
@@ -423,6 +419,8 @@ en:
     MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this page and all it's children? If the page is translated in other languages, those translations will be kept and must be deleted separately. Otherwise the page folder will be deleted along with its subpages. This action cannot be undone.
     AND: and
     UPDATE_AVAILABLE: Update available
+    METADATA_KEY: "Key (e.g. 'Keywords')"
+    METADATA_VALUE: "Value (e.g. 'Blog, Grav')"
 
 es:
   PLUGIN_ADMIN:
@@ -861,6 +859,8 @@ it:
     MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Sicuro di voler cancellare questa pagina? Se la pagina è tradotta in altre lingue, tali lingue verranno preservate e dovranno essere cancellate a parte. Altrimenti verrà cancellata la pagina e tutte le sottopagine. Questa azione non può essere annullata.
     AND: e
     UPDATE_AVAILABLE: Aggiornamento disponibile
+    METADATA_KEY: "Key (e.g. 'Keywords')"
+    METADATA_VALUE: "Value (e.g. 'Blog, Grav')"
 
 de:
   PLUGIN_ADMIN:
@@ -1280,3 +1280,5 @@ de:
     MODAL_DELETE_PAGE_CONFIRMATION_REQUIRED_DESC: Are you sure you want to delete this page and all it's children? If the page is translated in other languages, those translations will be kept and must be deleted separately. This action cannot be undone.
     AND: und
     UPDATE_AVAILABLE: Aktualisierung verfügbar
+    METADATA_KEY: "Key (e.g. 'Keywords')"
+    METADATA_VALUE: "Value (e.g. 'Blog, Grav')"
diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig
@@ -1,3 +1,4 @@
+{% set base_url_relative_frontend = base_url_relative_frontend is not empty ?: '/' %}
 <!DOCTYPE html>
 <html lang="en">
 <head>

diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig
@@ -10,7 +10,8 @@
         {% endif %}
     {% endfor %}
 
+    <input type="hidden" name="task" value="continue" />
     <div class="button-bar">
-        <button class="button primary" name="task" value="continue">{{ "PLUGIN_ADMIN.CONTINUE"|tu }}</button>
+        <button class="button primary">{{ "PLUGIN_ADMIN.CONTINUE"|tu }}</button>
     </div>
 </form>
diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig
@@ -10,36 +10,4 @@
             </div>
         {% endif %}
     {% endfor %}
-
-
-
-    {#
-    <div class="button-bar">
-        <button class="button" name="task" value="save">Save</button>
-        {% if context.exists %}
-        <button class="button" name="task" value="copy">Copy</button>
-        {% endif %}
-        {% if context.exists or context.isDir %}
-        <button class="button confirm-delete" name="task" value="delete" formnovalidate="formnovalidate">Delete</button>
-        {% endif %}
-    </div>
-    <script type="text/javascript">
-        $('.confirm-delete').click(function(){
-            var that = this;
-            vex.dialog.confirm({
-                message: 'Are you sure you want to delete the page and all content under it?',
-                callback: function(success) {
-                    if (success) {
-                        var form = $(that).closest('form');
-
-                        $('<input />').attr('type', 'hidden').attr('name', 'task').attr('value', $(that).val()).appendTo(form);
-
-                        form.submit();
-                    }
-                }
-            });
-            return false;
-        });
-    </script>
-    #}
 </form>