summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-12-09 13:18:13 +0100
committerVincent Petry <pvince81@owncloud.com>2014-05-15 17:51:04 +0200
commit04f73275ba222f0aae80cf80890477b141cd4902 (patch)
treeab1ee17c689414a9352f2669b7a289d4c5f6a0e4
parentb2e8aa70cde85302f7b7928370b681e3f01de7a8 (diff)
downloadnextcloud-server-04f73275ba222f0aae80cf80890477b141cd4902.tar.gz
nextcloud-server-04f73275ba222f0aae80cf80890477b141cd4902.zip
Now settings CSS class with appid in content DIV
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--lib/private/template.php4
-rw-r--r--lib/private/templatelayout.php4
3 files changed, 7 insertions, 3 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a217446ca73..b0ae8637acc 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -123,7 +123,7 @@
</div></nav>
<div id="content-wrapper">
- <div id="content">
+ <div id="content" class="app-<?php p($_['appid']) ?>">
<?php print_unescaped($_['content']); ?>
</div>
</div>
diff --git a/lib/private/template.php b/lib/private/template.php
index 3d18b52bac9..dfeb5d14b08 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -30,6 +30,7 @@ class OC_Template extends \OC\Template\Base {
private $renderas; // Create a full page?
private $path; // The path to the template
private $headers=array(); //custom headers
+ protected $app; // app id
/**
* @brief Constructor
@@ -62,6 +63,7 @@ class OC_Template extends \OC\Template\Base {
// Set the private data
$this->renderas = $renderas;
$this->path = $path;
+ $this->app = $app;
parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
}
@@ -172,7 +174,7 @@ class OC_Template extends \OC\Template\Base {
$data = parent::fetchPage();
if( $this->renderas ) {
- $page = new OC_TemplateLayout($this->renderas);
+ $page = new OC_TemplateLayout($this->renderas, $this->app);
// Add custom headers
$page->assign('headers', $this->headers, false);
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 0672ffc4a3d..a5dd9a0c614 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -15,8 +15,9 @@ class OC_TemplateLayout extends OC_Template {
/**
* @param string $renderas
+ * @param string $appid application id
*/
- public function __construct( $renderas ) {
+ public function __construct( $renderas, $appid = '' ) {
// Decide which page we show
if( $renderas == 'user' ) {
@@ -43,6 +44,7 @@ class OC_TemplateLayout extends OC_Template {
// Add navigation entry
$this->assign( 'application', '', false );
+ $this->assign( 'appid', $appid );
$navigation = OC_App::getNavigation();
$this->assign( 'navigation', $navigation);
$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());