From 09b194aab9e547b95a82ef5827f84bacba478d71 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 15 Apr 2016 17:03:34 -0400
Subject: [PATCH] Portfolio template errors fixed

---
 css/app.css                             | 16 ++++++-------
 js/app.js                               |  3 ---
 js/custom/pageSetup.js                  |  3 ---
 nggallery/gallery-glmphotos-light-3.php | 32 ++++++++++++++++++-------
 scss/plugins/_nextgen.scss              | 10 ++++----
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/css/app.css b/css/app.css
index 4e6cc07..c1593e8 100644
--- a/css/app.css
+++ b/css/app.css
@@ -6869,7 +6869,7 @@ h2#block-title {
     color: #f5822a;
     letter-spacing: 0.1em;
     font-size: 1.5rem;
-    line-height: 1.0;
+    line-height: 1.2;
     font-family: "Lato";
     font-style: normal;
     font-weight: normal;
@@ -7142,9 +7142,9 @@ h2#block-title {
   text-transform: capitalize;
   margin: 8px auto 0;
   cursor: pointer; }
-  #gallery-glmphotos-light-3 .photoTitle:hover .photoTitleInner, #gallery-glmphotos-light-5 .photoTitle:hover .photoTitleInner {
+  #gallery-glmphotos-light-3 .photoTitle:hover a, #gallery-glmphotos-light-5 .photoTitle:hover a {
     color: #ec6c0b; }
-  #gallery-glmphotos-light-3 .photoTitle:hover .photoTitleInner:before, #gallery-glmphotos-light-3 .photoTitle:hover .photoTitleInner:after, #gallery-glmphotos-light-5 .photoTitle:hover .photoTitleInner:before, #gallery-glmphotos-light-5 .photoTitle:hover .photoTitleInner:after {
+  #gallery-glmphotos-light-3 .photoTitle:hover a:before, #gallery-glmphotos-light-3 .photoTitle:hover a:after, #gallery-glmphotos-light-5 .photoTitle:hover a:before, #gallery-glmphotos-light-5 .photoTitle:hover a:after {
     transform: scaleX(1);
     border-color: #0568b3; }
   @media only screen and (max-width: 40em) {
@@ -7153,9 +7153,9 @@ h2#block-title {
   @media only screen and (min-width:40.063em) and (max-width:64em) {
     #gallery-glmphotos-light-3 .photoTitle h4, #gallery-glmphotos-light-5 .photoTitle h4 {
       font-size: 20px; } }
-  #gallery-glmphotos-light-3 .photoTitle .photoTitleInner, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner {
+  #gallery-glmphotos-light-3 .photoTitle a, #gallery-glmphotos-light-5 .photoTitle a {
     text-align: center; }
-    #gallery-glmphotos-light-3 .photoTitle .photoTitleInner:after, #gallery-glmphotos-light-3 .photoTitle .photoTitleInner:before, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner:after, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner:before {
+    #gallery-glmphotos-light-3 .photoTitle a:after, #gallery-glmphotos-light-3 .photoTitle a:before, #gallery-glmphotos-light-5 .photoTitle a:after, #gallery-glmphotos-light-5 .photoTitle a:before {
       display: block;
       content: '';
       border-width: 1px;
@@ -7165,11 +7165,11 @@ h2#block-title {
       margin: 0 auto;
       transform: scaleX(0.0001);
       transition: transform 250ms ease-in-out; }
-    #gallery-glmphotos-light-3 .photoTitle .photoTitleInner:after, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner:after {
+    #gallery-glmphotos-light-3 .photoTitle a:after, #gallery-glmphotos-light-5 .photoTitle a:after {
       margin-top: 5px; }
-    #gallery-glmphotos-light-3 .photoTitle .photoTitleInner:before, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner:before {
+    #gallery-glmphotos-light-3 .photoTitle a:before, #gallery-glmphotos-light-5 .photoTitle a:before {
       margin-bottom: 5px; }
-    #gallery-glmphotos-light-3 .photoTitle .photoTitleInner:hover, #gallery-glmphotos-light-5 .photoTitle .photoTitleInner:hover {
+    #gallery-glmphotos-light-3 .photoTitle a:hover, #gallery-glmphotos-light-5 .photoTitle a:hover {
       text-decoration: none; }
 
 #gallery-glmphotos-light-5 a.ngg-fancybox {
diff --git a/js/app.js b/js/app.js
index 24dec13..acf7390 100644
--- a/js/app.js
+++ b/js/app.js
@@ -48,9 +48,6 @@ $(document).ready(function () {
             $(this).text(statement).fadeIn(1000);
         });
     },3100);
-    $(".photoTitle").each(function() {
-        $(this).find("> a:first-of-type").remove();
-    });
 
 
     $('.exit-off-canvas').click(function(e) {
diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 41ed1bd..7aa110a 100644
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -39,9 +39,6 @@ $(document).ready(function () {
             $(this).text(statement).fadeIn(1000);
         });
     },3100);
-    $(".photoTitle").each(function() {
-        $(this).find("> a:first-of-type").remove();
-    });
 
 
     $('.exit-off-canvas').click(function(e) {
diff --git a/nggallery/gallery-glmphotos-light-3.php b/nggallery/gallery-glmphotos-light-3.php
index 484ad77..1bf0cc8 100644
--- a/nggallery/gallery-glmphotos-light-3.php
+++ b/nggallery/gallery-glmphotos-light-3.php
@@ -60,11 +60,11 @@ Follow variables are useable :
                        title="<?php echo $innerdescription ?>"
                        <?php } ?>
                 
-                data-src="<?php echo nextgen_esc_url($image->imageURL) ?>"
-                data-thumbnail="<?php echo nextgen_esc_url($image->thumbnailURL); ?>"
-                data-image-id="<?php echo esc_attr($image->pid); ?>"
-                data-title="<?php echo esc_attr($image->alttext); ?>"
-                data-description="<?php echo $innerdescription; ?>"
+                        data-src="<?php echo nextgen_esc_url($image->imageURL) ?>"
+                        data-thumbnail="<?php echo nextgen_esc_url($image->thumbnailURL); ?>"
+                        data-image-id="<?php echo esc_attr($image->pid); ?>"
+                        data-title="<?php echo esc_attr($image->alttext); ?>"
+                        data-description="<?php echo $innerdescription; ?>"
                 <?php echo $image->thumbcode ?> >
                     <?php if ( !$image->hidden ) { ?>
 
@@ -80,24 +80,38 @@ Follow variables are useable :
                                 VIEW
                             </h5>
                         </div>
-                        
+                    </a>
                     <?php
                     $imageTitle = !preg_match(';is\d{2,}-\d{10,}-\d{5,}$;', $image->alttext) ? $image->alttext: '';
                     ?>
                         <?php if ($validlink) { ?>
                    <div class="photoTitle"> 
-                            <a class="photoTitleInner" href="<?php echo $innerdescription ?>" target="_blank">
+                            <a href="<?php echo $innerdescription ?>"  target="_blank">
                                 <div title="Visit the <?php echo esc_attr($image->alttext) ?> website!"
                                     alt="<?php echo esc_attr($image->alttext) ?>">
                                     <?php if (!$image->hidden) { echo esc_attr($imageTitle); }?>
                                 </div>
                             </a>
                         <?php } else { ?>
-                   </a><div class="photoTitle"> 
-                            <div class="photoTitleInner" title="<?php echo $innerdescription ?>"
+                   <div class="photoTitle"> 
+                        <a href="<?php echo nextgen_esc_url($image->imageURL) ?>"
+                            <?php if ($validlink) { ?>
+                            title="Visit the <a href='<?php echo $innerdescription ?>' target='_blank'> <?php echo esc_attr($image->alttext) ?></a> Website"
+                            <?php } else { ?>
+                            title="<?php echo $innerdescription ?>"
+                            <?php } ?>
+
+                             data-src="<?php echo nextgen_esc_url($image->imageURL) ?>"
+                             data-thumbnail="<?php echo nextgen_esc_url($image->thumbnailURL); ?>"
+                             data-image-id="<?php echo esc_attr($image->pid); ?>"
+                             data-title="<?php echo esc_attr($image->alttext); ?>"
+                             data-description="<?php echo $innerdescription; ?>"
+                            <?php echo $image->thumbcode ?> >
+                            <div title="<?php echo $innerdescription ?>"
                                 alt="<?php echo $innerdescription ?>">
                                 <?php if (!$image->hidden) { echo esc_attr($imageTitle); }?>
                             </div>
+                       </a>
                        <?php } ?>
                     </div>
                 </div>
diff --git a/scss/plugins/_nextgen.scss b/scss/plugins/_nextgen.scss
index a6ce154..60659ce 100644
--- a/scss/plugins/_nextgen.scss
+++ b/scss/plugins/_nextgen.scss
@@ -22,7 +22,7 @@
     color: #f5822a;
     letter-spacing: 0.1em;
     font-size: rem-calc(24);
-    line-height: 1.0;
+    line-height: 1.2;
     font-family: "Lato";
     font-style: normal;
     font-weight: normal;
@@ -348,11 +348,11 @@
         margin: 8px auto 0;
         cursor: pointer;
         &:hover {
-            .photoTitleInner {
+            a {
                 color: #ec6c0b;
             }
-            .photoTitleInner:before,
-            .photoTitleInner:after {
+            a:before,
+            a:after {
                 transform: scaleX(1);
                 border-color: rgba(5,104,179,1);
             }
@@ -367,7 +367,7 @@
                     font-size: 20px;
                 }
             }
-        .photoTitleInner {
+        a {
             text-align: center;
             &:after,
             &:before {
-- 
2.17.1