Make Charisma theme dark, fix some bootstrap issues.

This commit is contained in:
DariusIII
2016-06-07 15:01:01 +02:00
parent 1a6211864f
commit 5e01ec56fd
13 changed files with 43 additions and 125 deletions
+1
View File
@@ -1,4 +1,5 @@
2016-06-07 DariusIII
* Upd: Make Charisma theme dark, fix some bootstrap issues.
* Upd: Update composer.lock file
2016-06-06 DariusIII
* Fix: Fix the nntmux_fi_schema.sql
+1 -1
View File
@@ -8,7 +8,7 @@
<precommit>9</precommit>
<!-- this is the version of the pre-commit file in githooks NOT the files it calls -->
</hooks>
<commit>5272</commit></git>
<commit>5273</commit></git>
<scripts>
<last>
<date>0000-00-00</date>
-1
View File
@@ -1 +0,0 @@
node_modules
-53
View File
@@ -1,53 +0,0 @@
# Charisma
### Free, premium quality, responsive, multiple skin admin template.
##[Live Demo](http://usman.it/themes/charisma/)
### [Download](https://github.com/usmanhalalit/charisma/archive/master.zip)
##Features
- 9 different themes.
- Fully responsive, optimized UI for tablets and mobile phones, [see how it looks on different devices](http://www.responsinator.com/?url=usman.it%2Fthemes%2Fcharisma).
- Based on Bootstrap.
- Works on IE9+
- Commented code.
- Custom product tour, [see example](http://usman.it/themes/charisma/tour.html).
- Grid system, [see example](http://usman.it/themes/charisma/grid.html).
- Charts, including, pie, stack, flot, realtime etc.
- Data tables
- Widget boxes, collapsible, closable, [see example](http://usman.it/themes/charisma/grid.html).
- Photo gallery [see example](http://usman.it/themes/charisma/gallery.html).
- Ajaxified menus
- Full calendar, monthly weekly, daily, with todo list.
- Custom error page
- Auto active link detection and much more.
## Credits
Without these open source software Charisma woudn't have been possible:
- [Twitter Bootstrap](http://getbootstrap.com/)
- [jQuery](http://jquery.com)
- [Bootswatch](http://bootswatch.com/)
- [Chosen](http://harvesthq.github.com/chosen/)
- [Flot Charts](http://www.flotcharts.org/)
- [Full Calendar](http://arshaw.com/fullcalendar/)
- [Datatables](http://datatables.net/)
- [Colorbox](http://www.jacklmoore.com/colorbox/)
- [Noty](http://ned.im/noty/)
- [Raty](http://wbotelhos.com/raty)
- iPhone-style Checkboxes
- [Autogrowing Textarea](http://onehackoranother.com/projects/jquery/jquery-grab-bag/autogrow-textarea.html)
- [Animate.css](http://daneden.github.io/animate.css/)
- [Uploadify](http://www.uploadify.com/)
Please visit [http://usman.it/free-responsive-admin-template/](http://usman.it/free-responsive-admin-template/ "") for more information.
### [Donate Charisma](http://flattr.com/thing/1507720/usmanhalalitcharisma-on-GitHub)
___
&copy; 2012 - 2015 [Muhammad Usman](http://usman.it/). Licensed under the Apache License, Version 2.0.
-12
View File
@@ -1,12 +0,0 @@
var gulp = require('gulp');
var php2html = require('gulp-php2html');
gulp.task('compile-php', function() {
gulp.src(['./php-version/*.php', '!./php-version/header.php', '!./php-version/footer.php', '!./php-version/config.php'])
.pipe(php2html())
.pipe(gulp.dest('./'));
});
gulp.task('watch-php', function() {
gulp.watch('./php-version/*.php', ['compile-php']);
});
+2 -8
View File
@@ -1,7 +1,7 @@
$(document).ready(function () {
//themes, change CSS with JS
//default theme(CSS) is cerulean, change it if needed
var defaultTheme = 'slate';
var defaultTheme = 'cyborg';
var currentTheme = $.cookie('currentTheme') == null ? defaultTheme : $.cookie('currentTheme');
var msie = navigator.userAgent.match(/msie/i);
@@ -144,12 +144,6 @@ function docReady() {
//iOS / iPhone style toggle switch
$('.iphone-toggle').iphoneStyle();
//star rating
$('.raty').raty({
score: 4 //default stars
});
//gallery controls container animation
$('ul.gallery li').hover(function () {
$('img', this).fadeToggle(1000);
@@ -323,4 +317,4 @@ $.extend($.fn.dataTableExt.oPagination, {
}
}
}
});
});
-13
View File
@@ -1,13 +0,0 @@
Copyright 2012 - 2015 Muhammad Usman
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+17 -32
View File
@@ -27,10 +27,10 @@
<!-- Newposterwall -->
<link href="{$smarty.const.WWW_THEMES}/shared/css/posterwall.css" rel="stylesheet" type="text/css" media="screen" />
<!-- The styles -->
<link id="bs-css" href="{$smarty.const.WWW_THEMES}/{$theme}/css/bootstrap-spacelab.min.css" rel="stylesheet">
<link id="bs-css" href="{$smarty.const.WWW_THEMES}/{$theme}/css/bootstrap-cyborg.min.css" rel="stylesheet">
<link href="{$smarty.const.WWW_THEMES}/{$theme}/css/charisma-app.css" rel="stylesheet">
<link href='{$smarty.const.WWW_THEMES}/{$theme}/shared/assets/chosen/chosen.css' rel='stylesheet'>
<link href='{$smarty.const.WWW_THEMES}/{$theme}/shared/assets/colorbox/example3/colorbox.css'
<link href='{$smarty.const.WWW_THEMES}/shared/assets/chosen/chosen.css' rel='stylesheet'>
<link href='{$smarty.const.WWW_THEMES}/shared/assets/colorbox/example3/colorbox.css'
rel='stylesheet'>
<link href='{$smarty.const.WWW_THEMES}/shared/assets/responsive-tables-js/dist/responsivetables.css'
rel='stylesheet'>
@@ -41,29 +41,33 @@
<!-- Font Awesome Icons -->
<link href="{$smarty.const.WWW_THEMES}/shared/assets/font-awesome/css/font-awesome.min.css" rel="stylesheet"
type="text/css"/>
<link href="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.css" type="text/css" media="screen"/>
<link href="{$smarty.const.WWW_THEMES}/shared/css/jquery.qtip.css" type="text/css" media="screen"/>
<!-- Normalize.css -->
<link href="{$smarty.const.WWW_THEMES}/shared/css/normalize.css" rel="stylesheet" type="text/css">
<link href="{$smarty.const.WWW_THEMES}/shared/assets/icheck/skins/square/blue.css" rel="stylesheet">
<!-- The fav icon -->
<link rel="shortcut icon" href="{$smarty.const.WWW_THEMES}/shared/images/favicon.ico">
</head>
<body>
<!-- topbar starts -->
<div class="navbar navbar-default" role="navigation">
<div class="navbar-inner">
<button type="button" class="navbar-toggle pull-left animated flip">
<div class="container-fluid">
<button type="button" class="navbar-toggle navbar-left animated flip">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{$site->home_link}"> <img alt="newznab-tmux logo"
src="{$smarty.const.WWW_THEMES}/{$theme}/img/logo-tmux.png"
/></a>
<div class="navbar-header">
<a href="{$site->home_link}" class="navbar-brand">
<span>{$site->title}</span></a>
</div>
<div class="navbar-header">
{$header_menu}
</div>
<!-- user dropdown starts -->
{if $loggedin == "true"}
<div class="btn-group pull-right">
<div class="btn-group navbar-right">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-user"></i><span class="hidden-sm hidden-xs"><span
class="username"> Hi, {$userdata.username}</span></span>
@@ -100,28 +104,7 @@
<div class="nav-sm nav nav-stacked">
</div>
<ul class="nav nav-pills nav-stacked main-menu">
<!-- search form -->
{if $loggedin == "true"}
<form id="headsearch_form" action="{$smarty.const.WWW_TOP}/search/" method="get">
<input id="headsearch" name="search" value="{if $header_menu_search == ""}Search...{else}{$header_menu_search|escape:"htmlall"}{/if}" class="form-control" type="text" tabindex="1$" />
<div class="row" style="padding-top:3px;">
<div class="col-md-8">
<select id="headcat" name="t" class="form-control" data-search="true">
<option class="grouping" value="-1">All</option>
{foreach $parentcatlist as $parentcat}
<option {if $header_menu_cat == $parentcat.id}selected="selected"{/if} value="{$parentcat.id}"> [{$parentcat.title}]</option>
{foreach $parentcat.subcatlist as $subcat}
<option {if $header_menu_cat == $subcat.id}selected="selected"{/if} value="{$subcat.id}">&nbsp;&nbsp;&nbsp; > {$subcat.title}</option>
{/foreach}
{/foreach}
</select>
</div>
<div class="col-md-3">
<input id="headsearch_go" type="submit" class="btn btn-dark" style="margin-top:0px; margin-left:4px;" value="Go"/>
</div>
</div>
</form>
<!-- /.search form -->
<li class="nav-header">Main</li>
<li><a href="{$site->home_link}"><i class="fa fa-home"></i><span> Home</span> <span
class="fa arrow"></span></a></li>
@@ -234,6 +217,8 @@
src="{$smarty.const.WWW_THEMES}/shared/assets/responsive-tables-js/dist/responsivetables.js"></script>
<!-- for iOS style toggle switch -->
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/js/jquery.iphone.toggle.js"></script>
<!-- icheck -->
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/icheck/icheck.min.js"></script>
<!-- autogrowing textarea plugin -->
<script type="text/javascript"
src="{$smarty.const.WWW_THEMES}/{$theme}/js/jquery.autogrow-textarea.js"></script>
@@ -252,7 +237,7 @@
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/js/functions.js"></script>
<!-- newznab default scripts, needed for stuff to work -->
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/autosize/dist/autosize.min.js"></script>
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.js"></script>
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/js/jquery.qtip2.js"></script>
<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/js/sorttable.js"></script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -192,6 +192,23 @@
<li><a href="{$smarty.const.WWW_TOP}/browse?t={$catClass::OTHER_HASHED}">Hashed</a></li>
</ul>
</li>
<ul class="nav pull-left">
<li class="">
<form class="navbar-form" id="headsearch_form" action="{$smarty.const.WWW_TOP}/search/" method="get">
<select class="form-control" id="headcat" name="t">
<option class="grouping" value="-1">All</option>
{foreach $parentcatlist as $parentcat}
<option {if $header_menu_cat == $parentcat.id}selected="selected"{/if} class="grouping" value="{$parentcat.id}">{$parentcat.title}</option>
{foreach $parentcat.subcatlist as $subcat}
<option {if $header_menu_cat == $subcat.id}selected="selected"{/if} value="{$subcat.id}">&nbsp;&nbsp;{$subcat.title}</option>
{/foreach}
{/foreach}
</select>
<input class="form-control" id="headsearch" name="search" value="{if $header_menu_search == ""}{else}{$header_menu_search|escape:"htmlall"}{/if}" placeholder="Search" type="text" />
<button id="headsearch_go" type="submit" class="btn btn-success"><i class="fa fa-search"></i></button>
</form>
</li>
</ul>
<!-- End If logged in -->
{/if}
{/if}
+1 -1
View File
@@ -67,7 +67,7 @@
================================================== -->
<!-- If you want the navbar "white" remove Navbar-inverse -->
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner" style="padding-left:30px; padding-right:30px;">
<div class="container" style="padding-left:30px; padding-right:30px;">
<div class="container">
{if $loggedin == "true"}
{$header_menu}
+2 -2
View File
@@ -7,7 +7,7 @@
</p>
</div>
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<form id="frmMyMovieLookup" class="navbar-form pull-left">
<div class="input-append">
<input class="input-xlarge" type="text" id="txtsearch" placeholder="Movie Title or IMDB Id" />
@@ -17,4 +17,4 @@
</div>
</div>
<div id="divMovResults">
</div>
</div>
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<form method="get" class="navbar-form pull-left" action="{$smarty.const.WWW_TOP}/search">
<div id="sbasic" style="text-align:center;{if $sadvanced} display:none;{/if}">
<div class="input-append">
+1 -1
View File
@@ -3,7 +3,7 @@
</div>
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<form method="get" class="navbar-form pull-left" action="{$smarty.const.WWW_TOP}/searchraw">
<div class="input-append">