Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
260b9431
Commit
260b9431
authored
Nov 16, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 16, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1852522: don't show 'Display page' for site templates"
parents
fd746e48
527fefd9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
htdocs/theme/raw/templates/view/editviewpageactions.tpl
htdocs/theme/raw/templates/view/editviewpageactions.tpl
+6
-4
htdocs/view/blocks.php
htdocs/view/blocks.php
+1
-0
No files found.
htdocs/theme/raw/templates/view/editviewpageactions.tpl
View file @
260b9431
...
...
@@ -13,10 +13,12 @@
</a>
{/
if
}
{
if
$selected
==
'content'
}
<a
id=
'displaypagebtn'
class=
"btn btn-secondary editviews displaycontent active"
href=
"
{
$WWWROOT
}
view/view.php?id=
{
$viewid
}
"
title=
"
{
str
tag
=
displayview
section
=
view
}
"
>
<span
class=
"icon icon-lg icon-tv"
aria-hidden=
"true"
role=
"presentation"
></span>
<span
class=
"btn-title sr-only"
>
{
str
tag
=
displayview
section
=
view
}
</span>
</a>
{
if
$viewurl
}
<a
id=
'displaypagebtn'
class=
"btn btn-secondary editviews displaycontent active"
href=
"
{
$WWWROOT
}
view/view.php?id=
{
$viewid
}
"
title=
"
{
str
tag
=
displayview
section
=
view
}
"
>
<span
class=
"icon icon-lg icon-tv"
aria-hidden=
"true"
role=
"presentation"
></span>
<span
class=
"btn-title sr-only"
>
{
str
tag
=
displayview
section
=
view
}
</span>
</a>
{/
if
}
{
else
}
<a
class=
"btn btn-secondary editviews editcontent
{
if
$selected
==
'content'
}
active
{/
if
}
"
href=
"
{
$WWWROOT
}
view/blocks.php?id=
{
$viewid
}
"
title=
"
{
str
tag
=
editcontent1
section
=
view
}
"
>
<span
class=
"icon icon-lg icon-pencil-alt"
aria-hidden=
"true"
role=
"presentation"
></span>
...
...
htdocs/view/blocks.php
View file @
260b9431
...
...
@@ -368,6 +368,7 @@ $smarty->assign('instructions', $view->get('instructions'));
$smarty
->
assign
(
'instructionscollapsed'
,
$view
->
get
(
'instructionscollapsed'
));
$returnto
=
$view
->
get_return_to_url_and_title
();
$smarty
->
assign
(
'url'
,
$returnto
[
'url'
]);
$smarty
->
assign
(
'viewurl'
,
$view
->
get_url
());
$smarty
->
assign
(
'title'
,
$returnto
[
'title'
]);
$smarty
->
assign
(
'accessible'
,
$view
->
get
(
'accessibleview'
));
$smarty
->
display
(
'view/blocks.tpl'
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment