mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

Enh: Cleanup authentication layout file

Browse Source
This commit is contained in:
Lucas Bartholemy 2017-03-15 19:18:29 +01:00
parent 59304b9002
commit bc58e1f6c9
2 changed files with 7 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protected/humhub/docs/CHANGELOG.md
View File

@ -1,6 +1,5 @@
HumHub Change Log
=================
- Fix: All LDAP Users have been disabled and not reenabled by hourly cronjob if ldap server not reachable.
1.2.0-beta.3 under developement
@ -66,6 +65,8 @@ HumHub Change Log
- Fix: Directory Knob statistics on included modules (e.g. Enterprise Edition)
- Enh: Added widget to display user profile image
- Enh: Directory view templates cleanups
- Fix: All LDAP Users have been disabled and not reenabled by hourly cronjob if ldap server not reachable.
- Enh: Cleanup authentication layout file
1.2.0-beta.2 (February 24, 2017)
--------------------------------

63
protected/humhub/modules/user/views/layouts/main.php
View File

@ -3,7 +3,6 @@
use yii\helpers\Html;
use humhub\assets\AppAsset;
/* @var $this \yii\web\View */
/* @var $content string */
@ -13,72 +12,20 @@ AppAsset::register($this);
<!DOCTYPE html>
<html lang="en">
<head>
<!-- start: Meta -->
<meta charset="utf-8">
<title><?php echo Html::encode($this->pageTitle); ?></title>
<!-- end: Meta -->
<!-- start: Mobile Specific -->
<title><?= Html::encode($this->pageTitle); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- end: Mobile Specific -->
<?= Html::csrfMetaTags() ?>
<?php $this->head() ?>
<!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="<?php echo Yii::getAlias("@web"); ?>/js/html5shiv.js"></script>
<link id="ie-style" href="<?php echo Yii::getAlias("@web"); ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 9]>
<link id="ie9style" href="<?php echo Yii::getAlias("@web"); ?>/css/ie9.css" rel="stylesheet">
<![endif]-->
<!-- start: render additional head (css and js files) -->
<?php echo $this->render('@humhub/views/layouts/head'); ?>
<!-- end: render additional head -->
<!-- start: Favicon and Touch Icons -->
<link rel="apple-touch-icon" sizes="57x57" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="<?php echo Yii::getAlias("@web"); ?>//ico/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="<?php echo Yii::getAlias("@web"); ?>/ico/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="<?php echo Yii::getAlias("@web"); ?>/ico/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="<?php echo Yii::getAlias("@web"); ?>/ico/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="<?php echo Yii::getAlias("@web"); ?>/ico/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="<?php echo Yii::getAlias("@web"); ?>/ico/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<?= $this->render('@humhub/views/layouts/head'); ?>
<meta charset="<?= Yii::$app->charset ?>">
<!-- end: Favicon and Touch Icons -->
</head>
<body class="login-container">
<?php $this->beginBody() ?>
<!-- start: show content (and check, if exists a sublayout -->
<?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
<?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
<?php else: ?>
<?php echo $content; ?>
<?php endif; ?>
<!-- end: show content -->
<?= \humhub\widgets\LayoutAddons::widget(); ?>
<?= $content; ?>
<?php $this->endBody() ?>
<div class="text text-center powered">
Powered by <a href="http://www.humhub.org" target="_blank">HumHub</a>
</div>
<div class="text text-center powered">Powered by <a href="http://www.humhub.org" target="_blank">HumHub</a></div>
</body>
</html>