added bootstrap cosmo to mobile theme

This commit is contained in:
SJ 2013-07-31 23:52:51 +02:00
parent 8b18ce4896
commit 21eb6355ac
12 changed files with 52 additions and 24 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -19,6 +19,8 @@ $config['BRANDING_URL'] = '';
$config['BRANDING_LOGO'] = '';
$config['SUPPORT_LINK'] = '';
$config['BOOTSTRAP_THEME'] = '-cosmo';
$config['DEFAULT_LANG'] = 'en';
$config['THEME'] = 'default';

View File

@ -79,7 +79,7 @@ class ModelSaasCustomer extends Model
'branding_url' => BRANDING_URL,
'branding_logo' => BRANDING_LOGO,
'support_link' => SUPPORT_LINK,
'colour' => ''
'colour' => BRANDING_COLOUR
);

View File

@ -19,14 +19,14 @@
.email { background-color: white; }
#menu { height: 40px; border: 0px solid red; }
#menu a:hover, #menu a:active { color: #850505; }
#menu a:hover, #menu a:active { color: #fff; }
#main { margin: 0px 40px 20px 40px; width: 100%; text-align: left; float: left; clear: both; }
.sleek { margin:0; padding:0; }
.center { text-align: center; }
#expertsearch { position: absolute; border: 0px solid black; right: 20px; left: 20px; text-align: left; font: normal 19px Arial, sans-serif; margin-top: 10px; }
#expertsearch { position: absolute; border: 0px solid black; right: 20px; left: 20px; text-align: left; font: normal 19px Arial, sans-serif; margin-top: 18px; }
#resultsheader { display: none; }
#resultstop { position: absolute; width: 1140px; border: 0px solid #999; top: 120px; right: 20px; left: 20px; text-align: right; display: table; padding-right: 0px; margin-right: 20px; }
@ -137,7 +137,7 @@
/* rc splitter stuff */
#mainscreen { position: absolute; top: 90px; right: 20px; bottom: 20px; left: 20px; }
#mainscreen { position: absolute; top: 90px; right: 20px; bottom: 20px; left: 20px; margin-top: 5px; }
#mailleftcontainer { position: absolute; top: 0; left: 0; bottom: 0; width: 195px; }
#mailboxlist-container { position: absolute; top: 0; left: 0; width: 100%; bottom: 0; border: 1px solid #999; background-color: #F9F9F9; overflow-y: auto; overflow-x: hidden; }
@ -150,7 +150,7 @@
.boxlistcontent { position: absolute; top: 5px; bottom: 50px; left: 0; right: 0; width: 100%; overflow-y: auto; overflow-x: hidden; height: auto; }
.boxfooter { position: absolute; bottom: 0px; left: 0px; right: 0px; overflow: hidden; border-top: 1px solid #999; }
.splitter { user-select: none; -moz-user-select: none; -khtml-user-select: none; position: absolute; background: url(/view/theme/orig/images/dimple.png) center no-repeat; }
.splitter { user-select: none; -moz-user-select: none; -khtml-user-select: none; position: absolute; background: url(/view/theme/mobile/images/dimple.png) center no-repeat; }
.splitter-h { cursor: n-resize; cursor: row-resize; background-position: center 2px; }
.splitter-v { cursor: e-resize; cursor: col-resize; background-position: 2px center; }

View File

@ -1,5 +1,5 @@
<div id="resultscontainer"<?php if($n <= 0) { ?> class="empty"<?php } ?>>
<div id="messagelistcontainer" class="boxlistcontent">
<div id="results">
@ -23,7 +23,6 @@
</div>
</div>
@ -49,3 +48,5 @@
</div>
</div>

View File

@ -13,7 +13,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap<?php print BOOTSTRAP_THEME; ?>.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/jquery-ui-custom.min.css" />
@ -39,14 +39,17 @@
<div id="expertsearch">
<form class="well form-search sleek">
<input type="hidden" name="searchtype" id="searchtype" value="expert" />
<input type="hidden" name="sort" id="sort" value="date" />
<input type="hidden" name="order" id="order" value="0" />
<input type="text" id="_search" name="_search" class="input-medium search-query span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
<input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
<button id="button_search" class="btn btn-primary" onclick="Piler.auditexpert(this);"><?php print $text_search; ?></button>
<button id="button_search" class="btn btn-primary" onclick="Piler.auditexpert(this); return false;"><?php print $text_search; ?></button>
<input type="button" class="btn" onclick="Piler.cancel();" value="<?php print $text_cancel; ?>" />
</form>
<div id="sspinner">
<div class="progress progress-striped active">

View File

@ -11,7 +11,7 @@
<meta name="rating" content="general" />
<meta name="robots" content="all" />
<link rel="stylesheet" type="text/css" href="/view/theme/default/stylesheet/style-<?php print THEME; ?>.css" />
<link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/style-<?php print THEME; ?>.css" />
<script type="text/javascript">

View File

@ -13,7 +13,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap<?php print BOOTSTRAP_THEME; ?>.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/jquery-ui-custom.min.css" />
@ -38,13 +38,15 @@
<div id="expertsearch">
<form class="well form-search sleek">
<input type="hidden" name="searchtype" id="searchtype" value="expert" />
<input type="hidden" name="sort" id="sort" value="date" />
<input type="hidden" name="order" id="order" value="0" />
<input type="hidden" name="ref" id="ref" value="" />
<input type="hidden" name="prefix" id="prefix" value="" />
<input type="text" id="_search" name="_search" class="input-medium search-query span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
<input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
<a id="advsearch_caret" href="#" onclick="$('#searchpopup1').show();"><b class="caret"></b></a>
@ -55,6 +57,8 @@
<button class="btn btn-inverse" onclick="Piler.load_saved_search_terms(); return false;"><?php print $text_load; ?></button>
<button class="btn btn-warning" onclick="Piler.remove_saved_search_terms('<?php print $text_successfully_removed; ?>'); return false;"><?php print $text_remove; ?></button>
</form>
<?php print $popup; ?>
<div id="sspinner">

View File

@ -13,7 +13,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap<?php print BOOTSTRAP_THEME; ?>.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/jquery-ui-custom.min.css" />

View File

@ -1,6 +1,6 @@
<?php if(Registry::get('username')) { ?>
<div class="navbar">
<div class="navbar navbar-inverse">
<div class="navbar-inner"<?php if($settings['colour']) { ?> style="background: <?php print $settings['colour']; ?>;"<?php } ?>>
@ -11,7 +11,7 @@
<?php if($admin_user == 1) { ?>
<li class="dropdown<?php if(strstr($_SERVER['QUERY_STRING'], "stat/") || strstr($_SERVER['QUERY_STRING'], "health/") || strstr($_SERVER['QUERY_STRING'], "audit/") ) { ?> active<?php } ?>">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open"></i>&nbsp;<?php print $text_monitor; ?> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-eye-open icon-white"></i>&nbsp;<?php print $text_monitor; ?> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="index.php?route=stat/stat&timespan=daily"><?php print $text_statistics; ?></a></li>
<li><a href="index.php?route=health/health"><?php print $text_health; ?></a></li>
@ -25,7 +25,7 @@
<li class="divider-vertical"></li>
<li class="dropdown<?php if(strstr($_SERVER['QUERY_STRING'], "domain/") || $_SERVER['QUERY_STRING'] == "route=user/list" || strstr($_SERVER['QUERY_STRING'], "group/") || strstr($_SERVER['QUERY_STRING'], "policy/") ) { ?> active<?php } ?>">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-wrench"></i>&nbsp;<?php print $text_administration; ?> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-wrench icon-white"></i>&nbsp;<?php print $text_administration; ?> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="index.php?route=user/list"><?php print $text_users; ?></a></li>
<li><a href="index.php?route=group/list"><?php print $text_groups; ?></a></li>
@ -41,14 +41,14 @@
<?php } else { ?>
<li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php"><i class="icon-search"></i>&nbsp;<?php print $text_search; ?></a></li>
<li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php"><i class="icon-search icon-white"></i>&nbsp;<?php print $text_search; ?></a></li>
<?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
<li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "folders.php")){ ?> class="active"<?php } ?>><a href="folders.php"><?php print $text_folder; ?></a></li>
<?php } ?>
<?php if(ENABLE_AUDIT == 1 && $auditor_user == 1) { ?>
<li><a href="index.php?route=audit/audit"><i class="icon-book"></i>&nbsp;<?php print $text_audit; ?></a></li>
<li<?php if(strstr($_SERVER['REQUEST_URI'], "audit/audit")){ ?> class="active"<?php } ?>><a href="index.php?route=audit/audit"><i class="icon-book icon-white"></i>&nbsp;<?php print $text_audit; ?></a></li>
<?php } ?>
<?php if($settings['support_link']) { ?>
@ -61,15 +61,15 @@
<ul class="nav pull-right">
<?php if($settings['branding_url']) { ?><li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><?php print $settings['branding_text']; ?></a></li><?php } ?>
<?php if($settings['branding_url']) { ?><li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><i class="icon-share-alt icon-white"></i> <?php print $settings['branding_text']; ?></a></li><?php } ?>
<li class="divider-vertical"></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php print $_SESSION['realname']; ?> <i class="icon-user"></i> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php print $_SESSION['realname']; ?> <i class="icon-user icon-white"></i> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="settings.php"><?php print $text_settings; ?></a></li>
<li><a href="settings.php"><i class="icon-cog"></i>&nbsp;<?php print $text_settings; ?></a></li>
<li class="divider"></li>
<li><a href="logout.php"><?php print $text_logout; ?></a></li>
<li><a href="logout.php"><i class="icon-off"></i>&nbsp;<?php print $text_logout; ?></a></li>
</ul>
</li>
</ul>

View File

@ -72,7 +72,7 @@
<div class="row">
<div class="cellhealthleft"><?php print $text_disk_usage; ?></div>
<div class="cellhealthright"><?php foreach($shortdiskinfo as $partition) { ?><span class="bold <?php if($partition['utilization'] < HEALTH_RATIO) { ?>text-success<?php } else { ?>text-error<?php } ?>"><?php print $partition['partition']; ?> =&gt; <?php print $partition['used']; ?> / <?php print $partition['total']; ?> (<?php print $partition['utilization']; ?>%</span>) <?php } ?></div>
<div class="cellhealthright"><?php foreach($shortdiskinfo as $partition) { ?><span class="bold <?php if($partition['utilization'] < HEALTH_RATIO) { ?>text-success<?php } else { ?>text-error<?php } ?>"><?php print $partition['partition']; ?> =&gt; <?php print $partition['used']; ?> / <?php print $partition['total']; ?> (<?php print $partition['utilization']; ?>%</span>)<br /><?php } ?></div>
</div>
<div class="row">