Skip to content

Commit

Permalink
Made dashboard as landing page and various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Muhammad Usman committed Aug 16, 2012
1 parent 06ee1cf commit 71c5c0b
Show file tree
Hide file tree
Showing 19 changed files with 1,022 additions and 1,009 deletions.
7 changes: 4 additions & 3 deletions calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="dashboard.html"> <img alt="Charisma Logo" src="img/logo20.png" /> <span>Charisma</span></a>
<a class="brand" href="index.html"> <img alt="Charisma Logo" src="img/logo20.png" /> <span>Charisma</span></a>

<!-- theme selector starts -->
<div class="btn-group pull-right theme-container" >
Expand Down Expand Up @@ -95,7 +95,7 @@
<ul class="dropdown-menu">
<li><a href="#">Profile</a></li>
<li class="divider"></li>
<li><a href="index.html">Logout</a></li>
<li><a href="login.html">Logout</a></li>
</ul>
</div>
<!-- user dropdown ends -->
Expand All @@ -122,7 +122,7 @@
<div class="well nav-collapse sidebar-nav">
<ul class="nav nav-tabs nav-stacked main-menu">
<li class="nav-header hidden-tablet">Main</li>
<li><a class="ajax-link" href="dashboard.html"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li><a class="ajax-link" href="index.html"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li><a class="ajax-link" href="ui.html"><i class="icon-eye-open"></i><span class="hidden-tablet"> UI Features</span></a></li>
<li><a class="ajax-link" href="form.html"><i class="icon-edit"></i><span class="hidden-tablet"> Forms</span></a></li>
<li><a class="ajax-link" href="chart.html"><i class="icon-list-alt"></i><span class="hidden-tablet"> Charts</span></a></li>
Expand All @@ -136,6 +136,7 @@
<li><a href="tour.html"><i class="icon-globe"></i><span class="hidden-tablet"> Tour</span></a></li>
<li><a class="ajax-link" href="icon.html"><i class="icon-star"></i><span class="hidden-tablet"> Icons</span></a></li>
<li><a href="error.html"><i class="icon-ban-circle"></i><span class="hidden-tablet"> Error Page</span></a></li>
<li><a href="login.html"><i class="icon-lock"></i><span class="hidden-tablet"> Login Page</span></a></li>
</ul>
<label id="for-is-ajax" class="hidden-tablet" for="is-ajax"><input id="is-ajax" type="checkbox"> Ajax on menu</label>
</div><!--/.well -->
Expand Down
7 changes: 4 additions & 3 deletions chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="dashboard.html"> <img alt="Charisma Logo" src="img/logo20.png" /> <span>Charisma</span></a>
<a class="brand" href="index.html"> <img alt="Charisma Logo" src="img/logo20.png" /> <span>Charisma</span></a>

<!-- theme selector starts -->
<div class="btn-group pull-right theme-container" >
Expand Down Expand Up @@ -95,7 +95,7 @@
<ul class="dropdown-menu">
<li><a href="#">Profile</a></li>
<li class="divider"></li>
<li><a href="index.html">Logout</a></li>
<li><a href="login.html">Logout</a></li>
</ul>
</div>
<!-- user dropdown ends -->
Expand All @@ -122,7 +122,7 @@
<div class="well nav-collapse sidebar-nav">
<ul class="nav nav-tabs nav-stacked main-menu">
<li class="nav-header hidden-tablet">Main</li>
<li><a class="ajax-link" href="dashboard.html"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li><a class="ajax-link" href="index.html"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li><a class="ajax-link" href="ui.html"><i class="icon-eye-open"></i><span class="hidden-tablet"> UI Features</span></a></li>
<li><a class="ajax-link" href="form.html"><i class="icon-edit"></i><span class="hidden-tablet"> Forms</span></a></li>
<li><a class="ajax-link" href="chart.html"><i class="icon-list-alt"></i><span class="hidden-tablet"> Charts</span></a></li>
Expand All @@ -136,6 +136,7 @@
<li><a href="tour.html"><i class="icon-globe"></i><span class="hidden-tablet"> Tour</span></a></li>
<li><a class="ajax-link" href="icon.html"><i class="icon-star"></i><span class="hidden-tablet"> Icons</span></a></li>
<li><a href="error.html"><i class="icon-ban-circle"></i><span class="hidden-tablet"> Error Page</span></a></li>
<li><a href="login.html"><i class="icon-lock"></i><span class="hidden-tablet"> Login Page</span></a></li>
</ul>
<label id="for-is-ajax" class="hidden-tablet" for="is-ajax"><input id="is-ajax" type="checkbox"> Ajax on menu</label>
</div><!--/.well -->
Expand Down
Loading

0 comments on commit 71c5c0b

Please sign in to comment.