vishwamano

source of vishwamano.com
git clone git://git.ricketyspace.net/vishwamano.git
Log | Files | Refs

commit 15e8c760565a2fe6ac70ffea9f4b087228e3a74a
parent c39ead617e9df501ca4e6d6e0963a580266b0a75
Author: rsiddharth <rsiddharth@ninthfloor.org>
Date:   Wed, 12 Aug 2015 12:03:22 -0400

renamed fp-header.tpl -> header.tpl

	modified:   themes/bs3/templates/bio.tpl
	modified:   themes/bs3/templates/colophon.tpl
	modified:   themes/bs3/templates/contact.tpl
	modified:   themes/bs3/templates/frontpage.tpl
	modified:   themes/bs3/templates/gallery-genre.tpl
	renamed:    themes/bs3/templates/fp-header.tpl -> themes/bs3/templates/header.tpl
	modified:   themes/bs3/templates/p-classes.tpl
	modified:   themes/bs3/templates/screen-size.tpl
	modified:   themes/bs3/templates/students-gallery.tpl
	modified:   themes/bs3/templates/testimonials.tpl

Diffstat:
themes/bs3/templates/bio.tpl | 2+-
themes/bs3/templates/colophon.tpl | 2+-
themes/bs3/templates/contact.tpl | 2+-
themes/bs3/templates/fp-header.tpl | 45---------------------------------------------
themes/bs3/templates/frontpage.tpl | 2+-
themes/bs3/templates/gallery-genre.tpl | 2+-
themes/bs3/templates/header.tpl | 31++++++++++++++++---------------
themes/bs3/templates/p-classes.tpl | 2+-
themes/bs3/templates/screen-size.tpl | 2+-
themes/bs3/templates/students-gallery.tpl | 2+-
themes/bs3/templates/testimonials.tpl | 2+-
11 files changed, 25 insertions(+), 69 deletions(-)

diff --git a/themes/bs3/templates/bio.tpl b/themes/bs3/templates/bio.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> diff --git a/themes/bs3/templates/colophon.tpl b/themes/bs3/templates/colophon.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> diff --git a/themes/bs3/templates/contact.tpl b/themes/bs3/templates/contact.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div id="vm-contact-container" class="container-fluid"> <!-- top container start --> <div class="row vm-contact"> <!-- contact row start --> <div class="col-sm-12"> <!-- contact section start --> diff --git a/themes/bs3/templates/fp-header.tpl b/themes/bs3/templates/fp-header.tpl @@ -1,45 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="keywords" content="{$meta_keywords}"> - <meta name="description" content="{$meta_description}"> - <title>{$title}</title> - - <link href="{$doc_root}themes/bs3/css/vegas/vegas.min.css" rel="stylesheet" media="screen"> - <link href="{$doc_root}themes/bs3/css/jquery-colorbox/colorbox.css" rel="stylesheet" media="screen"> - <link href="{$doc_root}themes/bs3/css/font-awesome.min.css" rel="stylesheet" media="screen"> - <link href="{$doc_root}themes/bs3/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="{$doc_root}themes/bs3/css/custom.css" rel="stylesheet" media="screen"> - </head> -<body> - <nav id="vm-navbar" class="navbar navbar-default indian-flag" role="navigation"> - <div class="container-fluid"> - <!-- Brand and toggle get grouped for better mobile display --> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#vm-navbar-collapse"> - <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 visible-xs" href="/"> - <img class="img-responsive" src="/themes/bs3/img/vm-logo.png" - alt="[ Vishwa Mano Photography ]" /> - </a> - </div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse" id="vm-navbar-collapse"> - - <ul class="nav navbar-nav"> - <li class="vm-nav-item" id="nav-link-bio"><a href="/bio/">Bio</a></li> - <li class="vm-nav-item" id="nav-link-gallery"><a href="/gallery/">Gallery</a></li> - <li class="vm-nav-logo-middle hidden-xs" id="nav-link-home"><a href="/"><img src="/themes/bs3/img/vm-logo.png" alt="[ Vishwa Mano Photography ]" /></a></li> - <li class="vm-nav-item" id="nav-link-pc"><a href="/workshops/">Workshops</a></li> - <li class="vm-nav-item" id="nav-link-contact"><a href="/contact/">Contact</a></li> - </ul> - </div><!-- /.navbar-collapse --> - </div><!-- /.container-fluid --> - </nav> diff --git a/themes/bs3/templates/frontpage.tpl b/themes/bs3/templates/frontpage.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> diff --git a/themes/bs3/templates/gallery-genre.tpl b/themes/bs3/templates/gallery-genre.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> diff --git a/themes/bs3/templates/header.tpl b/themes/bs3/templates/header.tpl @@ -7,37 +7,38 @@ <meta name="description" content="{$meta_description}"> <title>{$title}</title> - <link rel="stylesheet" href="{$doc_root}themes/bs3/css/jquery-fancybox/jquery.fancybox.css" - type="text/css" media="screen" /> - <link rel="stylesheet" href="{$doc_root}themes/bs3/css/jquery.datetimepicker.css" - type="text/css" media="screen" /> + <link href="{$doc_root}themes/bs3/css/vegas/vegas.min.css" rel="stylesheet" media="screen"> + <link href="{$doc_root}themes/bs3/css/jquery-colorbox/colorbox.css" rel="stylesheet" media="screen"> + <link href="{$doc_root}themes/bs3/css/font-awesome.min.css" rel="stylesheet" media="screen"> <link href="{$doc_root}themes/bs3/css/bootstrap.min.css" rel="stylesheet" media="screen"> <link href="{$doc_root}themes/bs3/css/custom.css" rel="stylesheet" media="screen"> </head> <body> - - <nav class="navbar navbar-inverse" role="navigation"> + <nav id="vm-navbar" class="navbar navbar-default indian-flag" role="navigation"> <div class="container-fluid"> <!-- Brand and toggle get grouped for better mobile display --> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#vm-navbar-collapse"> <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="/">Vishwa Mano Photography</a> + <a class="navbar-brand visible-xs" href="/"> + <img class="img-responsive" src="/themes/bs3/img/vm-logo.png" + alt="[ Vishwa Mano Photography ]" /> + </a> </div> <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> + <div class="collapse navbar-collapse" id="vm-navbar-collapse"> - <ul class="nav navbar-nav navbar-right"> - <li id="nav-link-home"><a href="/">Home</a></li> - <li id="nav-link-gallery"><a href="/gallery/">Gallery</a></li> - <li id="nav-link-pc"><a href="/as/photography-classes">Photography Workshops</a></li> - <li id="nav-link-bio"><a href="/bio/">Bio</a></li> - <li id="nav-link-contact"><a href="/contact/"> Contact </a></li> + <ul class="nav navbar-nav"> + <li class="vm-nav-item" id="nav-link-bio"><a href="/bio/">Bio</a></li> + <li class="vm-nav-item" id="nav-link-gallery"><a href="/gallery/">Gallery</a></li> + <li class="vm-nav-logo-middle hidden-xs" id="nav-link-home"><a href="/"><img src="/themes/bs3/img/vm-logo.png" alt="[ Vishwa Mano Photography ]" /></a></li> + <li class="vm-nav-item" id="nav-link-pc"><a href="/workshops/">Workshops</a></li> + <li class="vm-nav-item" id="nav-link-contact"><a href="/contact/">Contact</a></li> </ul> </div><!-- /.navbar-collapse --> </div><!-- /.container-fluid --> diff --git a/themes/bs3/templates/p-classes.tpl b/themes/bs3/templates/p-classes.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> <article class="vm-workshops"> diff --git a/themes/bs3/templates/screen-size.tpl b/themes/bs3/templates/screen-size.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div id="top-container" class="container-fluid"> {include file='gallery-nav.tpl'} diff --git a/themes/bs3/templates/students-gallery.tpl b/themes/bs3/templates/students-gallery.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start --> diff --git a/themes/bs3/templates/testimonials.tpl b/themes/bs3/templates/testimonials.tpl @@ -1,4 +1,4 @@ -{include file='fp-header.tpl'} +{include file='header.tpl'} <div class="container-fluid"> <!-- top container start -->