Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F12312692
D3782.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D3782.diff
View Options
diff --git a/workspaces/src/apps/documents/DocumentsApplication.php b/workspaces/src/apps/documents/DocumentsApplication.php
--- a/workspaces/src/apps/documents/DocumentsApplication.php
+++ b/workspaces/src/apps/documents/DocumentsApplication.php
@@ -86,6 +86,10 @@
//Prints the list of the documents
$documents = $this->getDocumentsList();
$smarty->assign('documents', $documents);
+ $smarty->assign(
+ "docs_url",
+ get_url($this->context->workspace->code, "docs")
+ );
$template = 'documents_list.tpl';
} else {
//Prints a document
diff --git a/workspaces/src/content/help/credits.html b/workspaces/src/content/help/credits.html
--- a/workspaces/src/content/help/credits.html
+++ b/workspaces/src/content/help/credits.html
@@ -1,5 +1,5 @@
<ol class="breadcrumb">
- <li><a href="{get_url('help')}">Help</a></li>
+ <li><a href="{$help_url}">Help</a></li>
<li>About Obsidian Workspaces</li>
<li class="active">Credits</li>
</ol>
diff --git a/workspaces/src/controllers/header.php b/workspaces/src/controllers/header.php
--- a/workspaces/src/controllers/header.php
+++ b/workspaces/src/controllers/header.php
@@ -33,10 +33,14 @@
$smarty->assign('workspaces', $workspaces);
$smarty->assign('workspaces_count', count($workspaces));
- if ($this->context->workspace !== null) {
+ if ($this->context->workspace === null) {
+ $smarty->assign('root_url', get_url());
+ } else {
$workspace = $this->context->workspace;
+ $workspace_url = get_url($workspace->code);
$smarty->assign('current_workspace', $workspace);
+ $smarty->assign('current_workspace_url', $workspace_url);
//Gets custom header
if ($workspace->configuration->header != '') {
diff --git a/workspaces/src/controllers/help.php b/workspaces/src/controllers/help.php
--- a/workspaces/src/controllers/help.php
+++ b/workspaces/src/controllers/help.php
@@ -31,6 +31,7 @@
//Header
$context->templateEngine->assign('PAGE_TITLE', Language::get('Help'));
+$context->templateEngine->assign('help_url', get_url("help"));
$context->templateEngine->assign('controller_custom_nav', 'nav_help.tpl');
HeaderController::run($context);
diff --git a/workspaces/src/skins/bluegray/apps/documents/documents_list.tpl b/workspaces/src/skins/bluegray/apps/documents/documents_list.tpl
--- a/workspaces/src/skins/bluegray/apps/documents/documents_list.tpl
+++ b/workspaces/src/skins/bluegray/apps/documents/documents_list.tpl
@@ -2,8 +2,8 @@
<h1 class="page-header">Documents</h1>
{if $documents}
<ul id="documents">
-{foreach $documents item=document}
- <li class="document"><a href="{get_url($current_workspace->code, 'docs', $document)}">{$document}</a></li>
+{foreach from=$documents item=document}
+ <li class="document"><a href="{$docs_url}/{$document}">{$document}</a></li>
{/foreach}
</ul>
{else}
diff --git a/workspaces/src/skins/bluegray/errors/404.tpl b/workspaces/src/skins/bluegray/errors/404.tpl
--- a/workspaces/src/skins/bluegray/errors/404.tpl
+++ b/workspaces/src/skins/bluegray/errors/404.tpl
@@ -15,7 +15,7 @@
<h1>This page can’t be found.</h1>
<h2>We’re looking if your page could be found on the top of an Alaska mountain.</h2>
<p>Meanwhile, try to <a href="#" onClick="window.history.back();">go back to the
- previous page</a> or to <a href="{get_url()}">return to the
+ previous page</a> or to <a href="{$URL_HOME}">return to the
homepage</a>.</p>
</div>
</body>
diff --git a/workspaces/src/skins/bluegray/header.tpl b/workspaces/src/skins/bluegray/header.tpl
--- a/workspaces/src/skins/bluegray/header.tpl
+++ b/workspaces/src/skins/bluegray/header.tpl
@@ -27,9 +27,9 @@
<span class="icon-bar"></span>
</button>
{if isset($current_workspace)}
- <a class="navbar-brand" href="{get_url($current_workspace->code)}">{$current_workspace->name}</a>
+ <a class="navbar-brand" href="{$current_workspace_url}">{$current_workspace->name}</a>
{else}
- <a class="navbar-brand" href="{get_url()}">{#SiteTitle#}</a>
+ <a class="navbar-brand" href="{$root_url}">{#SiteTitle#}</a>
{/if}
</div>
@@ -67,9 +67,9 @@
<!-- Other right navigation actions -->
<li>
{if isset($current_workspace)}
- <a href="{get_url($current_workspace->code)}?action=user.logout">
+ <a href="{$current_workspace_url}?action=user.logout">
{else}
- <a href="{get_url()}?action=user.logout">
+ <a href="{$root_url}?action=user.logout">
{/if}
<i class="fa fa-sign-out fa-fw"></i> {#Logout#}
diff --git a/workspaces/src/skins/bluegray/nav_help.tpl b/workspaces/src/skins/bluegray/nav_help.tpl
--- a/workspaces/src/skins/bluegray/nav_help.tpl
+++ b/workspaces/src/skins/bluegray/nav_help.tpl
@@ -12,22 +12,22 @@
</div>
</li>
{if isset($current_workspace)}
- <li><a href="{get_url($current_workspace->code)}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
+ <li><a href="{$current_workspace_url}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
{else}
- <li><a href="{get_url()}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
+ <li><a href="{$root_url}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
{/if}
<li>
<a href="#"><i class="fa fa-question fa-fw"></i> Support & services<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
- <li><a href="{get_url('help', 'new-workspace')}">Create a new workspace</a></li>
- <li><a href="{get_url('help', 'support')}">Technical support</a></li>
+ <li><a href="{$help_url}/new-workspace">Create a new workspace</a></li>
+ <li><a href="{$help_url}/support">Technical support</a></li>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-info fa-fw"></i> About Obsidian Workspaces<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
- <li><a href="{get_url('help', 'about')}">About</a></li>
- <li><a href="{get_url('help', 'credits')}">Credits</a></li>
+ <li><a href="{$help_url}/about">About</a></li>
+ <li><a href="{$help_url}/credits">Credits</a></li>
</ul>
</li>
</ul>
diff --git a/workspaces/src/skins/bluegray/nav_main.tpl b/workspaces/src/skins/bluegray/nav_main.tpl
--- a/workspaces/src/skins/bluegray/nav_main.tpl
+++ b/workspaces/src/skins/bluegray/nav_main.tpl
@@ -12,14 +12,14 @@
</div>
</li>
{if isset($current_workspace)}
- <li><a href="{get_url($current_workspace->code)}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
+ <li><a href="{$current_workspace_url}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
{foreach from=$current_workspace_nav item=nav}
- <li><a href="{get_url($current_workspace->code, $nav.url)}"><i class="fa {if $nav.icon}fa-{$nav.icon}{else}fa-circle-o{/if} fa-fw"></i> {$nav.link}</a></li>
+ <li><a href="{$current_workspace_url}/{$nav.url}"><i class="fa {if $nav.icon}fa-{$nav.icon}{else}fa-circle-o{/if} fa-fw"></i> {$nav.link}</a></li>
{/foreach}
- <li><a href="{get_url($current_workspace->code, 'help')}"><i class="fa fa-question fa-fw"></i> {#Help#}</a></li>
+ <li><a href="{$current_workspace_url}/help"><i class="fa fa-question fa-fw"></i> {#Help#}</a></li>
{else}
- <li><a href="{get_url()}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
- <li><a href="{get_url('help')}"><i class="fa fa-question fa-fw"></i> {#Help#}</a></li>
+ <li><a href="{$root_url}"><i class="fa fa-dashboard fa-fw"></i> {#Home#}</a></li>
+ <li><a href="{$root_url}/help"><i class="fa fa-question fa-fw"></i> {#Help#}</a></li>
{/if}
</ul>
</div>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 23, 00:53 (20 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3097553
Default Alt Text
D3782.diff (8 KB)
Attached To
Mode
D3782: Don't call get_url from templates
Attached
Detach File
Event Timeline
Log In to Comment