Merge with quitta-gsoc-2013

This commit is contained in:
Botanic 2013-06-17 02:24:41 -07:00
commit d0345ee9fa
3 changed files with 6 additions and 4 deletions

View file

@ -274,7 +274,8 @@ function docReady(){
$('#myModal').modal('show');
});
$('.btn-help').click(function(e){
alert('test');
}
});

View file

@ -4,7 +4,7 @@ function show_help(help_tip)
{
var tour = new Tour();
tour.addStep({
element: ".span10:first", /* html element next to which the step popover should be shown */
element: ".dashboard-avatar:first", /* 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 */
@ -20,7 +20,8 @@ function show_help(help_tip)
title: "Dashboard",
content: "This is your dashboard from here you will find highlights."
});
tour.restart();
}
}

View file

@ -114,7 +114,7 @@
<div class="box-header well">
<h2><i class="icon-info-sign"></i> Introduction</h2>
<div class="box-icon">
<a href="#" class="btn btn-help btn-round"><i class="icon-info-sign"></i></a>
<a href="#" class="btn btn-round" onclick="javascript:show_help('test');return false;"><i class="icon-info-sign"></i></a>
<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>