From 42cf75688ba38a2d4b5f4b6d5d006a4678dea28f Mon Sep 17 00:00:00 2001
From: Muhammad Usman <mdusyl@yahoo.com>
Date: Sun, 20 Jul 2014 15:42:33 +0600
Subject: [PATCH] Fix tour init.

---
 blank.html              | 3 +++
 calendar.html           | 3 +++
 chart.html              | 3 +++
 form.html               | 3 +++
 gallery.html            | 8 +++-----
 grid.html               | 3 +++
 icon.html               | 3 +++
 index.html              | 3 +++
 js/charisma.js          | 2 +-
 license.txt             | 2 +-
 login.html              | 3 +++
 php-version/footer.php  | 2 ++
 php-version/gallery.php | 5 -----
 php-version/header.php  | 1 +
 php-version/tour.php    | 2 +-
 table.html              | 3 +++
 tour.html               | 3 +++
 17 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/blank.html b/blank.html
index 1d289272..871efc3f 100755
--- a/blank.html
+++ b/blank.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -303,6 +304,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/calendar.html b/calendar.html
index 3ba206d7..6181bd2c 100755
--- a/calendar.html
+++ b/calendar.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -304,6 +305,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/chart.html b/chart.html
index 166d934e..2e507e55 100755
--- a/chart.html
+++ b/chart.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -432,6 +433,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/form.html b/form.html
index 3b99a3d5..cedc6d45 100755
--- a/form.html
+++ b/form.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -509,6 +510,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/gallery.html b/gallery.html
index 75ec3ab9..d3f5b01b 100755
--- a/gallery.html
+++ b/gallery.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -216,11 +217,6 @@ <h2><i class="glyphicon glyphicon-picture"></i> Gallery</h2>
                     </div>
                 </div>
                 <div class="box-content">
-                    <p class="center">
-                        <button id="toggle-fullscreen" class="btn btn-primary btn-lg visible-md" data-toggle="button">
-                            Toggle Fullscreen
-                        </button>
-                    </p>
                     <br>
                     <ul class="thumbnails gallery">
                                                     <li id="image-&lt;?php echo $i ?&gt;" class="thumbnail">
@@ -453,6 +449,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/grid.html b/grid.html
index 0a529ac9..f286d6bf 100644
--- a/grid.html
+++ b/grid.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -516,6 +517,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/icon.html b/icon.html
index a2e93654..d2f9dd91 100755
--- a/icon.html
+++ b/icon.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -580,6 +581,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/index.html b/index.html
index a3a270c4..62112ac6 100755
--- a/index.html
+++ b/index.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -713,6 +714,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/js/charisma.js b/js/charisma.js
index 8b6c72ac..6869534e 100644
--- a/js/charisma.js
+++ b/js/charisma.js
@@ -234,7 +234,7 @@ function docReady() {
     if ($('.tour').length && typeof(tour) == 'undefined') {
         var tour = new Tour();
         tour.addStep({
-            element: ".span10:first", /* html element next to which the step popover should be shown */
+            element: "#content", /* html element next to which the step popover should be shown */
             placement: "top",
             title: "Custom Tour", /* title of the popover */
             content: "You can create tour like this. Click Next." /* content of the popover */
diff --git a/license.txt b/license.txt
index db6d3d92..35b0a82f 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-   Copyright 2013 Muhammad Usman
+   Copyright 2012 - 2014 Muhammad Usman
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/login.html b/login.html
index f45677f6..fc83f22a 100644
--- a/login.html
+++ b/login.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -120,6 +121,8 @@ <h2>Welcome to Charisma</h2>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/php-version/footer.php b/php-version/footer.php
index 85392112..e264d63d 100755
--- a/php-version/footer.php
+++ b/php-version/footer.php
@@ -80,6 +80,8 @@
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/php-version/gallery.php b/php-version/gallery.php
index cf9636a2..a0f15ec3 100755
--- a/php-version/gallery.php
+++ b/php-version/gallery.php
@@ -26,11 +26,6 @@ class="glyphicon glyphicon-remove"></i></a>
                     </div>
                 </div>
                 <div class="box-content">
-                    <p class="center">
-                        <button id="toggle-fullscreen" class="btn btn-primary btn-lg visible-md" data-toggle="button">
-                            Toggle Fullscreen
-                        </button>
-                    </p>
                     <br>
                     <ul class="thumbnails gallery">
                         <?php for ($i = 1; $i <= 24; $i++) { ?>
diff --git a/php-version/header.php b/php-version/header.php
index dda461a7..cffbda31 100755
--- a/php-version/header.php
+++ b/php-version/header.php
@@ -31,6 +31,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'>
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
diff --git a/php-version/tour.php b/php-version/tour.php
index 58b1291c..b54c1923 100755
--- a/php-version/tour.php
+++ b/php-version/tour.php
@@ -28,7 +28,7 @@ class="glyphicon glyphicon-remove"></i></a>
                 <div class="box-content">
                     <a href="tour.html">Click Here to restart the tour</a><br>
                     You can create Custom Tour, like this. <br> For more help on implementing tour go <a
-                        href="http://pushly.github.com/bootstrap-tour/index.html" target="_blank">here</a>
+                        href="http://bootstraptour.com/" target="_blank">here</a>
                 </div>
             </div>
         </div>
diff --git a/table.html b/table.html
index 5f38e92e..350593ff 100755
--- a/table.html
+++ b/table.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'> 
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -1557,6 +1558,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->
diff --git a/tour.html b/tour.html
index 1df91e08..33714edc 100755
--- a/tour.html
+++ b/tour.html
@@ -30,6 +30,7 @@
     <link href='bower_components/chosen/chosen.min.css' rel='stylesheet'>
     <link href='bower_components/colorbox/example3/colorbox.css' rel='stylesheet'>
     <link href='bower_components/responsive-tables/responsive-tables.css' rel='stylesheet'>
+    <link href='bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css' rel='stylesheet'>
     <link href='css/jquery.noty.css' rel='stylesheet'>
     <link href='css/noty_theme_default.css' rel='stylesheet'>
     <link href='css/elfinder.min.css' rel='stylesheet'>
@@ -303,6 +304,8 @@ <h3>Settings</h3>
 <script src="js/jquery.noty.js"></script>
 <!-- library for making tables responsive -->
 <script src="bower_components/responsive-tables/responsive-tables.js"></script>
+<!-- tour plugin -->
+<script src="bower_components/bootstrap-tour/build/js/bootstrap-tour.min.js"></script>
 <!-- star rating plugin -->
 <script src="js/jquery.raty.min.js"></script>
 <!-- for iOS style toggle switch -->