From 4172ba48d4c2ffc34c2020b256aca333de692c23 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 9 Feb 2015 16:01:52 +0100 Subject: [PATCH] Deduplicate template code and do not translate the links --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 2 +- core/templates/layout.noscript.warning.php | 11 +++++++++++ core/templates/layout.user.php | 2 +- settings/templates/admin.php | 6 +----- settings/templates/personal.php | 4 +--- .../templates/settings.development.notice.php | 19 +++++++++++++++++++ 7 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 core/templates/layout.noscript.warning.php create mode 100644 settings/templates/settings.development.notice.php diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 768a965599..7069c0c263 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -24,7 +24,7 @@ - + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 19b89e47e5..8deda443d9 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -25,7 +25,7 @@ - +
diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php new file mode 100644 index 0000000000..ba781f5502 --- /dev/null +++ b/core/templates/layout.noscript.warning.php @@ -0,0 +1,11 @@ + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 34fad7e6cd..292fa5cf55 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ - +
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 55887b0df4..d3cf1dc972 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -515,11 +515,7 @@ if ($_['suggestedOverwriteCliUrl']) {

t('Version'));?>

getTitle()); ?> - -

- t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -

- +
diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d6bc1d2bb5..b98156a7c5 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -286,9 +286,7 @@ if($_['passwordChangeSupported']) {

t('Version'));?>

getTitle()); ?>
- - t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> - +
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php new file mode 100644 index 0000000000..c88c90f6b6 --- /dev/null +++ b/settings/templates/settings.development.notice.php @@ -0,0 +1,19 @@ + +

+ ', + '', + '', + '', + ], + $l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') + )); ?> +

+