diff --git a/Changelog b/Changelog index 09ba5cf9d..408ce2cd3 100755 --- a/Changelog +++ b/Changelog @@ -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 diff --git a/build/nntmux.xml b/build/nntmux.xml index d97d7b6c3..f604d8310 100755 --- a/build/nntmux.xml +++ b/build/nntmux.xml @@ -8,7 +8,7 @@ 9 - 5272 + 5273 0000-00-00 diff --git a/www/themes/Charisma/.gitignore b/www/themes/Charisma/.gitignore deleted file mode 100755 index b512c09d4..000000000 --- a/www/themes/Charisma/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/www/themes/Charisma/README.md b/www/themes/Charisma/README.md deleted file mode 100755 index 441162c58..000000000 --- a/www/themes/Charisma/README.md +++ /dev/null @@ -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) - -___ -© 2012 - 2015 [Muhammad Usman](http://usman.it/). Licensed under the Apache License, Version 2.0. diff --git a/www/themes/Charisma/gulpfile.js b/www/themes/Charisma/gulpfile.js deleted file mode 100755 index 2de385d77..000000000 --- a/www/themes/Charisma/gulpfile.js +++ /dev/null @@ -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']); -}); \ No newline at end of file diff --git a/www/themes/Charisma/js/charisma.js b/www/themes/Charisma/js/charisma.js index 71606f67b..6e2feb7a2 100755 --- a/www/themes/Charisma/js/charisma.js +++ b/www/themes/Charisma/js/charisma.js @@ -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, { } } } -}); \ No newline at end of file +}); diff --git a/www/themes/Charisma/license.txt b/www/themes/Charisma/license.txt deleted file mode 100755 index 25a5a67f3..000000000 --- a/www/themes/Charisma/license.txt +++ /dev/null @@ -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. diff --git a/www/themes/Charisma/templates/basepage.tpl b/www/themes/Charisma/templates/basepage.tpl index e0c9d2fe4..42e772bd8 100755 --- a/www/themes/Charisma/templates/basepage.tpl +++ b/www/themes/Charisma/templates/basepage.tpl @@ -27,10 +27,10 @@ - + - - + @@ -41,29 +41,33 @@ - + +