From 509deebe52fbc9161fa472e61bfc68d540c52018 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 5 Jul 2018 11:28:18 +0100 Subject: [PATCH] Add new recipe link for users with permission --- blocks/ORB/Userbar.pm | 15 ++++++++++++--- lang/en/userbar.lang | 1 + templates/default/sidemenu/opt-new-disabled.tem | 1 + templates/default/sidemenu/opt-new-enabled.tem | 1 + templates/default/sidemenu/signedin.tem | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 templates/default/sidemenu/opt-new-disabled.tem create mode 100644 templates/default/sidemenu/opt-new-enabled.tem diff --git a/blocks/ORB/Userbar.pm b/blocks/ORB/Userbar.pm index ce0b349..6ee47ed 100644 --- a/blocks/ORB/Userbar.pm +++ b/blocks/ORB/Userbar.pm @@ -76,6 +76,11 @@ sub block_display { pathinfo => [ ], params => {}, forcessl => 1), + "%(url-new)s" => $self -> build_url(block => "new", + fullurl => 1, + pathinfo => [ ], + params => {}, + forcessl => 1), "%(url-tags)s" => $self -> build_url(block => "tags", fullurl => 1, pathinfo => [ ], @@ -112,10 +117,14 @@ sub block_display { "%(gravhash)s" => $user -> {"gravatar_hash"}, }); + my $new = $self -> check_permission("recipe.create") ? "enabled" : "disabled"; + my $newopt = $self -> {"template"} -> load_template("sidemenu/opt-new-${new}.tem"); + $sidemenu = $self -> {"template"} -> load_template("sidemenu/signedin.tem", - { "%(realname)s" => $user -> {"fullname"}, - "%(username)s" => $user -> {"username"}, - "%(gravhash)s" => $user -> {"gravatar_hash"}, + { "%(realname)s" => $user -> {"fullname"}, + "%(username)s" => $user -> {"username"}, + "%(gravhash)s" => $user -> {"gravatar_hash"}, + "%(option-new)s" => $newopt, }); } else { diff --git a/lang/en/userbar.lang b/lang/en/userbar.lang index 8e756b5..a4df1d8 100644 --- a/lang/en/userbar.lang +++ b/lang/en/userbar.lang @@ -16,6 +16,7 @@ USERBAR_IMPORT = Import schedule SIDE_TITLE = Online Recipe Book SIDE_SUMMARIES = Summaries SIDE_RECIPES = Recipes +SIDE_NEW = Add Recipe SIDE_TAGS = Tags SIDE_TYPES = Types SIDE_SHOPPING = Shopping diff --git a/templates/default/sidemenu/opt-new-disabled.tem b/templates/default/sidemenu/opt-new-disabled.tem new file mode 100644 index 0000000..17cd934 --- /dev/null +++ b/templates/default/sidemenu/opt-new-disabled.tem @@ -0,0 +1 @@ + diff --git a/templates/default/sidemenu/opt-new-enabled.tem b/templates/default/sidemenu/opt-new-enabled.tem new file mode 100644 index 0000000..7e72ffc --- /dev/null +++ b/templates/default/sidemenu/opt-new-enabled.tem @@ -0,0 +1 @@ +
  • {L_SIDE_NEW}
  • diff --git a/templates/default/sidemenu/signedin.tem b/templates/default/sidemenu/signedin.tem index b3ddfa2..0bda47d 100644 --- a/templates/default/sidemenu/signedin.tem +++ b/templates/default/sidemenu/signedin.tem @@ -4,6 +4,7 @@