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

Rebuilt layouts for limited access for non registered users

Browse Source
This commit is contained in:
andystrobel 2015-03-04 14:34:08 +01:00
parent eac361db92
commit 79c3a0a49e
13 changed files with 287 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/style.css
View File

@ -405,6 +405,9 @@ textarea {
height: 20px; height: 20px;
width: 20px; width: 20px;
} }
.comment-container {
margin-top: 10px;
}
.comment .media { .comment .media {
position: relative !important; position: relative !important;
margin-top: 0; margin-top: 0;
@ -414,6 +417,12 @@ textarea {
right: -3px; right: -3px;
top: -3px; top: -3px;
} }
.comment.guest-mode .media:last-child .wall-entry-controls {
margin-bottom: 0px;
}
.comment.guest-mode .media:last-child hr {
display: none;
}
ul.tag_input { ul.tag_input {
list-style: none; list-style: none;
background-color: #ffffff; background-color: #ffffff;
@ -571,7 +580,7 @@ ul.tour-list li.completed a {
.wall-entry-controls { .wall-entry-controls {
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 0px;
} }
.tags .tag { .tags .tag {
margin-top: 5px; margin-top: 5px;

19
css/style.less
View File

@ -527,6 +527,11 @@ textarea {
} }
// comments // comments
.comment-container {
margin-top: 10px;
}
.comment { .comment {
.media { .media {
@ -540,7 +545,19 @@ textarea {
} }
} }
}
.comment.guest-mode {
.media:last-child {
.wall-entry-controls {
margin-bottom: 0px;
}
hr {
display: none;
}
}
} }
// User- & Space picker // User- & Space picker
@ -742,7 +759,7 @@ ul.tour-list {
.wall-entry-controls { .wall-entry-controls {
font-size: 12px; font-size: 12px;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 0px;
} }
// Tags // Tags

78
js/app.js
View File

@ -1,6 +1,6 @@
/** /**
* Holds all already loaded javascript libaries * Holds all already loaded javascript libaries
* *
* @type HashTable * @type HashTable
*/ */
var currentLoadedJavaScripts = new HashTable(); var currentLoadedJavaScripts = new HashTable();
@ -9,9 +9,9 @@ var currentLoadedJavaScripts = new HashTable();
/** /**
* Looks for script tags inside the given string and checks if the files * Looks for script tags inside the given string and checks if the files
* are already loaded. * are already loaded.
* *
* When already loaded, the scripts will ignored. * When already loaded, the scripts will ignored.
* *
* @returns {undefined} * @returns {undefined}
*/ */
function parseHtml(htmlString) { function parseHtml(htmlString) {
@ -39,17 +39,15 @@ function parseHtml(htmlString) {
} }
/** /**
* Hashtable * Hashtable
* *
* Javscript Class which represents a hashtable. * Javscript Class which represents a hashtable.
* *
* @param {type} obj * @param {type} obj
* @returns {HashTable} * @returns {HashTable}
*/ */
function HashTable(obj) function HashTable(obj) {
{
this.length = 0; this.length = 0;
this.items = {}; this.items = {};
for (var p in obj) { for (var p in obj) {
@ -59,8 +57,7 @@ function HashTable(obj)
} }
} }
this.setItem = function(key, value) this.setItem = function (key, value) {
{
var previous = undefined; var previous = undefined;
if (this.hasItem(key)) { if (this.hasItem(key)) {
previous = this.items[key]; previous = this.items[key];
@ -72,17 +69,15 @@ function HashTable(obj)
return previous; return previous;
} }
this.getItem = function(key) { this.getItem = function (key) {
return this.hasItem(key) ? this.items[key] : undefined; return this.hasItem(key) ? this.items[key] : undefined;
} }
this.hasItem = function(key) this.hasItem = function (key) {
{
return this.items.hasOwnProperty(key); return this.items.hasOwnProperty(key);
} }
this.removeItem = function(key) this.removeItem = function (key) {
{
if (this.hasItem(key)) { if (this.hasItem(key)) {
previous = this.items[key]; previous = this.items[key];
this.length--; this.length--;
@ -94,8 +89,7 @@ function HashTable(obj)
} }
} }
this.keys = function() this.keys = function () {
{
var keys = []; var keys = [];
for (var k in this.items) { for (var k in this.items) {
if (this.hasItem(k)) { if (this.hasItem(k)) {
@ -105,8 +99,7 @@ function HashTable(obj)
return keys; return keys;
} }
this.values = function() this.values = function () {
{
var values = []; var values = [];
for (var k in this.items) { for (var k in this.items) {
if (this.hasItem(k)) { if (this.hasItem(k)) {
@ -116,7 +109,7 @@ function HashTable(obj)
return values; return values;
} }
this.each = function(fn) { this.each = function (fn) {
for (var k in this.items) { for (var k in this.items) {
if (this.hasItem(k)) { if (this.hasItem(k)) {
fn(k, this.items[k]); fn(k, this.items[k]);
@ -124,9 +117,46 @@ function HashTable(obj)
} }
} }
this.clear = function() this.clear = function () {
{
this.items = {} this.items = {}
this.length = 0; this.length = 0;
} }
} }
// Replace the standard checkbox and radio buttons
$('body').find(':checkbox, :radio').flatelements();
$(document).ready(function () {
/* Ensures after hide modal content is removed. */
$('#globalModal').on('hidden.bs.modal', function (e) {
$(this).removeData('bs.modal');
// just close modal and reset modal content to default (shows the loader)
$(this).html('<div class="modal-dialog"><div class="modal-content"><div class="modal-body"><div class="loader"></div></div></div></div>');
})
});
// call this after every ajax loading
$(document).ajaxComplete(function (event, xhr, settings) {
// show Tooltips on elements inside the views, which have the class 'tt'
$('.tt').tooltip({
html: true,
container: 'body'
});
// show Popovers on elements inside the views, which have the class 'po'
$('.po').popover({html: true});
// activate placeholder text for older browsers (specially IE)
$('input, textarea').placeholder();
});
$('#globalModal').on('shown.bs.modal', function (e) {
// reduce the standard modal width
$('.modal-dialog').css('width', '300px');
})

6
protected/modules_core/comment/widgets/views/comments.php
View File

@ -16,8 +16,8 @@
?> ?>
<div class="well well-small" style="display: none;" id="comment_<?php echo $id; ?>"> <div class="well well-small comment-container" style="display: none;" id="comment_<?php echo $id; ?>">
<div class="comment" id="comments_area_<?php echo $id; ?>"> <div class="comment <?php if (Yii::app()->user->isGuest): ?>guest-mode<?php endif; ?>" id="comments_area_<?php echo $id; ?>">
<?php if ($isLimited): ?> <?php if ($isLimited): ?>
<?php <?php
// Create an ajax link, which loads all comments upon request // Create an ajax link, which loads all comments upon request
@ -47,4 +47,6 @@
$('#comment_<?php echo $id; ?>').show(); $('#comment_<?php echo $id; ?>').show();
<?php } ?> <?php } ?>
</script> </script>

12
protected/modules_core/space/views/space/invite.php
View File

@ -18,8 +18,8 @@
<?php if (HSetting::Get('internalUsersCanInvite', 'authentication_internal')) : ?> <?php if (HSetting::Get('internalUsersCanInvite', 'authentication_internal')) : ?>
<div class="text-center"> <div class="text-center">
<ul id="tabs" class="nav nav-tabs tabs-center" data-tabs="tabs"> <ul id="tabs" class="nav nav-tabs tabs-center" data-tabs="tabs">
<li class="active"><a href="#internal" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Pick users'); ?></a></li> <li class="active tab-internal"><a href="#internal" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Pick users'); ?></a></li>
<li class=""><a href="#external" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Invite by email'); ?></a></li> <li class="tab-external"><a href="#external" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Invite by email'); ?></a></li>
</ul> </ul>
</div> </div>
<br/> <br/>
@ -102,5 +102,13 @@
<?php endif; ?> <?php endif; ?>
$('.tab-internal a').on('shown.bs.tab', function (e) {
$('#invite_tag_input_field').focus();
})
$('.tab-external a').on('shown.bs.tab', function (e) {
$('#email_invite').focus();
})
</script> </script>

11
protected/modules_core/user/controllers/AuthController.php
View File

@ -20,13 +20,15 @@
/** /**
* AuthController handles all authentication tasks. * AuthController handles all authentication tasks.
* *
* @package humhub.modules_core.user.controllers * @package humhub.modules_core.user.controllers
* @since 0.5 * @since 0.5
*/ */
class AuthController extends Controller class AuthController extends Controller
{ {
//public $layout = '//layouts/main1';
public $layout = "application.modules_core.user.views.layouts.main_auth";
public $subLayout = "_layout"; public $subLayout = "_layout";
public function actions() public function actions()
@ -45,6 +47,7 @@ class AuthController extends Controller
*/ */
public function actionLogin() public function actionLogin()
{ {
// If user is already logged in, redirect him to the dashboard // If user is already logged in, redirect him to the dashboard
if (!Yii::app()->user->isGuest) { if (!Yii::app()->user->isGuest) {
$this->redirect(Yii::app()->user->returnUrl); $this->redirect(Yii::app()->user->returnUrl);
@ -254,7 +257,7 @@ class AuthController extends Controller
} }
/** /**
* Create an account * Create an account
* *
* This action is called after e-mail validation. * This action is called after e-mail validation.
*/ */
@ -389,8 +392,8 @@ class AuthController extends Controller
} }
$this->render('createAccount', array( $this->render('createAccount', array(
'form' => $form, 'form' => $form,
'needAproval' => $needApproval) 'needAproval' => $needApproval)
); );
} }

6
protected/modules_core/user/views/auth/_layout.php
View File

@ -5,9 +5,3 @@
</div> </div>
</div> </div>
<style type="text/css">
body {
background-color: #7191a8 !important;
}
</style>

60
protected/modules_core/user/views/auth/login_modal.php
View File

@ -5,14 +5,20 @@
<h4 class="modal-title" id="myModalLabel"><strong>Join</strong> the network</h4> <h4 class="modal-title" id="myModalLabel"><strong>Join</strong> the network</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<br /> <br/>
<div class="text-center"> <div class="text-center">
<ul id="tabs" class="nav nav-tabs tabs-center" data-tabs="tabs"> <ul id="tabs" class="nav nav-tabs tabs-center" data-tabs="tabs">
<li class="<?php echo (!isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>"><a href="#login" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Login'); ?></a></li> <li class="<?php echo (!isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?> tab-login"><a href="#login"
<li class="<?php echo (isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>"><a href="#register" data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'New user?'); ?></a></li> data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'Login'); ?></a>
</li>
<li class="<?php echo (isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?> tab-register"><a
href="#register"
data-toggle="tab"><?php echo Yii::t('SpaceModule.views_space_invite', 'New user?'); ?></a>
</li>
</ul> </ul>
</div> </div>
<br/> <br/>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane <?php echo (!isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>" id="login"> <div class="tab-pane <?php echo (!isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>" id="login">
@ -37,12 +43,13 @@
<?php echo $form->error($model, 'password'); ?> <?php echo $form->error($model, 'password'); ?>
</div> </div>
<div class="checkbox"> <div class="form-group">
<label> <div class="checkbox">
<?php echo $form->checkBox($model, 'rememberMe'); ?> <?php echo Yii::t('UserModule.views_auth_login', 'Remember me next time'); ?> <label>
</label> <?php echo $form->checkBox($model, 'rememberMe'); ?> <?php echo Yii::t('UserModule.views_auth_login', 'Remember me next time'); ?>
</label>
</div>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
@ -50,18 +57,18 @@
echo HHtml::ajaxButton(Yii::t('UserModule.views_auth_login', 'Sign in'), array('//user/auth/login'), array( echo HHtml::ajaxButton(Yii::t('UserModule.views_auth_login', 'Sign in'), array('//user/auth/login'), array(
'type' => 'POST', 'type' => 'POST',
'success' => 'function(html){ $("#globalModal").html(html); }', 'success' => 'function(html){ $("#globalModal").html(html); }',
), array('class' => 'btn btn-primary', 'id' => 'loginBtn')); ), array('class' => 'btn btn-primary', 'id' => 'loginBtn'));
?> ?>
</div> </div>
<div class="col-md-8 text-right"> <div class="col-md-8 text-right">
<small> <small>
<?php echo Yii::t('UserModule.views_auth_login', 'Forgot your password?'); ?> <?php echo Yii::t('UserModule.views_auth_login', 'Forgot your password?'); ?>
<br /> <br/>
<?php <?php
echo HHtml::ajaxLink(Yii::t('UserModule.views_auth_login', 'Create a new one.'), array('//user/auth/recoverPassword'), array( echo HHtml::ajaxLink(Yii::t('UserModule.views_auth_login', 'Create a new one.'), array('//user/auth/recoverPassword'), array(
'type' => 'POST', 'type' => 'POST',
'success' => 'function(html){ $("#globalModal").html(html); }', 'success' => 'function(html){ $("#globalModal").html(html); }',
), array('class' => '', 'id' => 'recoverPasswordBtn')); ), array('class' => '', 'id' => 'recoverPasswordBtn'));
?> ?>
</small> </small>
</div> </div>
@ -69,7 +76,8 @@
<?php $this->endWidget(); ?> <?php $this->endWidget(); ?>
</div> </div>
<div class="tab-pane <?php echo (isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>" id="register"> <div class="tab-pane <?php echo (isset($_POST['AccountRegisterForm'])) ? "active" : ""; ?>"
id="register">
<p><?php echo Yii::t('UserModule.views_auth_login', "Don't have an account? Join the network by entering your e-mail address."); ?></p> <p><?php echo Yii::t('UserModule.views_auth_login', "Don't have an account? Join the network by entering your e-mail address."); ?></p>
<?php <?php
@ -89,15 +97,35 @@
echo HHtml::ajaxButton(Yii::t('UserModule.views_auth_login', 'Register'), array('//user/auth/login'), array( echo HHtml::ajaxButton(Yii::t('UserModule.views_auth_login', 'Register'), array('//user/auth/login'), array(
'type' => 'POST', 'type' => 'POST',
'success' => 'function(html){ $("#globalModal").html(html); }', 'success' => 'function(html){ $("#globalModal").html(html); }',
), array('class' => 'btn btn-primary', 'id' => 'registerBtn')); ), array('class' => 'btn btn-primary', 'id' => 'registerBtn'));
?> ?>
<?php $this->endWidget(); ?> <?php $this->endWidget(); ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
// Replace the standard checkbox and radio buttons
$('body').find(':checkbox, :radio').flatelements();
$(document).ready(function () {
$('#login_username').focus();
});
$('.tab-register a').on('shown.bs.tab', function (e) {
$('#register-email').focus();
})
$('.tab-login a').on('shown.bs.tab', function (e) {
$('#login_username').focus();
})
</script>

92
protected/modules_core/user/views/layouts/main_auth.php Normal file
View File

@ -0,0 +1,92 @@
<?php /* @var $this Controller */ ?>
<!DOCTYPE html>
<html lang="en">
<head>
<!-- start: Meta -->
<meta charset="utf-8">
<title><?php echo CHtml::encode($this->pageTitle); ?></title>
<!-- end: Meta -->
<!-- start: Mobile Specific -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- end: Mobile Specific -->
<?php $ver = HVersion::VERSION; ?>
<!-- start: CSS -->
<link href="<?php echo Yii::app()->baseUrl; ?>/css/animate.min.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<link href="<?php echo Yii::app()->baseUrl; ?>/css/bootstrap.min.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<link href="<?php echo Yii::app()->baseUrl; ?>/css/style.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<link
href="<?php echo Yii::app()->baseUrl; ?>/resources/font-awesome/css/font-awesome.min.css?ver=<?php echo $ver; ?>"
rel="stylesheet">
<link href="<?php echo Yii::app()->baseUrl; ?>/css/flatelements.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<!-- end: CSS -->
<!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="<?php echo Yii::app()->baseUrl; ?>/js/html5shiv.js"></script>
<link id="ie-style" href="<?php echo Yii::app()->baseUrl; ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 9]>
<link id="ie9style" href="<?php echo Yii::app()->baseUrl; ?>/css/ie9.css" rel="stylesheet">
<![endif]-->
<!-- start: JavaScript -->
<script type="text/javascript"
src="<?php echo Yii::app()->baseUrl; ?>/js/bootstrap.min.js?ver=<?php echo $ver; ?>"></script>
<script type="text/javascript"
src="<?php echo Yii::app()->baseUrl; ?>/js/modernizr.js?ver=<?php echo $ver; ?>"></script>
<script type="text/javascript"
src="<?php echo Yii::app()->baseUrl; ?>/js/jquery.cookie.js?ver=<?php echo $ver; ?>"></script>
<script type="text/javascript"
src="<?php echo Yii::app()->baseUrl; ?>/js/jquery.flatelements.js?ver=<?php echo $ver; ?>"></script>
<script type="text/javascript"
src="<?php echo Yii::app()->baseUrl; ?>/js/jquery.placeholder.js?ver=<?php echo $ver; ?>"></script>
<!-- start: render additional head (css and js files) -->
<?php $this->renderPartial('application.views.layouts.head'); ?>
<!-- end: render additional head -->
<!-- Global app functions -->
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/js/app.js?ver=<?php echo $ver; ?>"></script>
<!-- end: JavaScript -->
<!-- start: Favicon and Touch Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144"
href="<?php echo Yii::app()->baseUrl; ?>/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114"
href="<?php echo Yii::app()->baseUrl; ?>/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72"
href="<?php echo Yii::app()->baseUrl; ?>/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed"
href="<?php echo Yii::app()->baseUrl; ?>/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="<?php echo Yii::app()->baseUrl; ?>/ico/favicon.ico">
<!-- end: Favicon and Touch Icons -->
</head>
<body class="login-container">
<!-- 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 -->
<script type="text/javascript">
// Replace the standard checkbox and radio buttons
$('body').find(':checkbox, :radio').flatelements();
</script>
<?php echo HSetting::GetText('trackingHtmlCode'); ?>
</body>
</html>

2
protected/modules_core/user/widgets/views/accountTopMenu.php
View File

@ -1,6 +1,6 @@
<?php if (Yii::app()->user->isGuest): ?> <?php if (Yii::app()->user->isGuest): ?>
<a href="<?php echo $this->createUrl('//user/auth/login'); ?>" class="btn btn-lg" data-toggle="modal" data-target="#globalModal">Sign in / up</a> <a href="<?php echo $this->createUrl('//user/auth/login'); ?>" class="btn btn-enter" data-toggle="modal" data-target="#globalModal">Sign in / up</a>
<?php else: ?> <?php else: ?>

44
protected/views/layouts/main.php
View File

@ -21,10 +21,8 @@
<link href="<?php echo Yii::app()->baseUrl; ?>/resources/font-awesome/css/font-awesome.min.css?ver=<?php echo $ver; ?>" rel="stylesheet"> <link href="<?php echo Yii::app()->baseUrl; ?>/resources/font-awesome/css/font-awesome.min.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<link href="<?php echo Yii::app()->baseUrl; ?>/css/bootstrap-wysihtml5.css?ver=<?php echo $ver; ?>" rel="stylesheet"> <link href="<?php echo Yii::app()->baseUrl; ?>/css/bootstrap-wysihtml5.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<link href="<?php echo Yii::app()->baseUrl; ?>/css/flatelements.css?ver=<?php echo $ver; ?>" rel="stylesheet"> <link href="<?php echo Yii::app()->baseUrl; ?>/css/flatelements.css?ver=<?php echo $ver; ?>" rel="stylesheet">
<!-- end: CSS --> <!-- end: CSS -->
<!-- The HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="<?php echo Yii::app()->baseUrl; ?>/js/html5shiv.js"></script> <script src="<?php echo Yii::app()->baseUrl; ?>/js/html5shiv.js"></script>
@ -146,8 +144,6 @@
<?php $this->widget('application.modules_core.tour.widgets.TourWidget', array()); ?> <?php $this->widget('application.modules_core.tour.widgets.TourWidget', array()); ?>
<!-- start: show content (and check, if exists a sublayout --> <!-- start: show content (and check, if exists a sublayout -->
<?php if (isset($this->subLayout) && $this->subLayout != "") : ?> <?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
<?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?> <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
@ -169,46 +165,6 @@
</div> </div>
<!-- end: Modal --> <!-- end: Modal -->
<script type="text/javascript">
// Replace the standard checkbox and radio buttons
$('body').find(':checkbox, :radio').flatelements();
$(document).ready(function() {
/* Ensures after hide modal content is removed. */
$('#globalModal').on('hidden.bs.modal', function(e) {
$(this).removeData('bs.modal');
// just close modal and reset modal content to default (shows the loader)
$(this).html('<div class="modal-dialog"><div class="modal-content"><div class="modal-body"><div class="loader"></div></div></div></div>');
})
});
// call this after every ajax loading
$(document).ajaxComplete(function(event, xhr, settings) {
// show Tooltips on elements inside the views, which have the class 'tt'
$('.tt').tooltip({
html: true,
container: 'body'
});
// show Popovers on elements inside the views, which have the class 'po'
$('.po').popover({html: true});
// activate placeholder text for older browsers (specially IE)
$('input, textarea').placeholder();
});
$('#globalModal').on('shown.bs.modal', function(e) {
// reduce the standard modal width
$('.modal-dialog').css('width', '300px');
})
</script>
<?php echo HSetting::GetText('trackingHtmlCode'); ?> <?php echo HSetting::GetText('trackingHtmlCode'); ?>
</body> </body>
</html> </html>

18
themes/HumHub/css/theme.css
View File

@ -27,6 +27,12 @@ h4 {
.text-center { .text-center {
text-align: center !important; text-align: center !important;
} }
.login-container {
background: #7191a8;
}
#account-login-form .form-group {
margin-bottom: 10px;
}
.topbar .dropdown-header { .topbar .dropdown-header {
font-weight: 300; font-weight: 300;
color: #bebebe; color: #bebebe;
@ -47,6 +53,13 @@ h4 {
#topbar-first .btn-group > a { #topbar-first .btn-group > a {
background-color: #819db2; background-color: #819db2;
} }
#topbar-first .btn-enter {
background-color: #819db2;
margin: 6px 0;
}
#topbar-first .btn-enter:hover {
background-color: #8aa5b8;
}
#topbar-first .media-list a { #topbar-first .media-list a {
color: #555555; color: #555555;
} }
@ -320,7 +333,7 @@ h4 {
margin-bottom: 1px; margin-bottom: 1px;
} }
.well hr { .well hr {
margin: 5px 0 10px 0; margin: 15px 0 10px 0;
border-top: 1px solid #d9d9d9; border-top: 1px solid #d9d9d9;
} }
.well table > thead { .well table > thead {
@ -1198,6 +1211,9 @@ img.bounceIn {
color: #ffffff; color: #ffffff;
text-decoration: underline; text-decoration: underline;
} }
.outside .panel a {
color: #4cd9c0;
}
.outside h1, .outside h1,
.outside h2 { .outside h2 {
color: #ffffff !important; color: #ffffff !important;

32
themes/HumHub/css/theme.less
View File

@ -69,6 +69,20 @@ h4 {
text-align: center !important; text-align: center !important;
} }
//
// x) Login
// --------------------------------------------------
.login-container {
background: #7191a8;
}
#account-login-form {
.form-group {
margin-bottom: 10px;
}
}
// //
// x) Topbar // x) Topbar
// -------------------------------------------------- // --------------------------------------------------
@ -79,7 +93,7 @@ h4 {
color: @colorFont4; color: @colorFont4;
.dropdown-header-link a { .dropdown-header-link a {
color: #4cd9c0 !important; color: @colorInfo2 !important;
} }
} }
} }
@ -100,6 +114,15 @@ h4 {
background-color: lighten(@colorPrimary3, 5%); background-color: lighten(@colorPrimary3, 5%);
} }
.btn-enter {
background-color: lighten(@colorPrimary3, 5%);
margin: 6px 0;
}
.btn-enter:hover {
background-color: lighten(@colorPrimary3, 8%);
}
.media-list { .media-list {
a { a {
@ -454,7 +477,7 @@ h4 {
margin-bottom: 1px; margin-bottom: 1px;
hr { hr {
margin: 5px 0 10px 0; margin: 15px 0 10px 0;
border-top: 1px solid darken(@colorBackground2, 8%); border-top: 1px solid darken(@colorBackground2, 8%);
} }
@ -1594,6 +1617,11 @@ img.bounceIn {
color: #ffffff; color: #ffffff;
text-decoration: underline; text-decoration: underline;
} }
}
.panel a {
color: @colorInfo2;
} }
h1, h2 { h1, h2 {