Changeset 1075

Timestamp:

04/27/10 15:34:28 (22 months ago)

Author:

johnnyoffline

Message:

there were two different sets of classes for the Pager styles and markup floating around. I made them all use the same classes

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/aMedia/templates/_videoSearch.php (modified) (2 diffs)
• modules/aPager/templates/_pager.php (modified) (1 diff)
• web/css/a.css (modified) (13 diffs)

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_videoSearch.php

@@ -27 +27 @@
     <br class="clear" />
 
-    <div id="a-media-video-search-pagination" class="a_pager_navigation"></div>
+    <div id="a-media-video-search-pagination" class="a-pager-navigation"></div>
     <br class="clear" />
 
@@ -90 +90 @@
       if (i === aMediaVideoSearchPage)
       {
-        item = $('<span class="a_page_navigation_number a_pager_navigation_disabled">' + i + '</span>');
+        item = $('<span class="a-page-navigation-number a-pager-navigation-disabled">' + i + '</span>');
       }
       else
       {
-        item = $('<span class="a_page_navigation_number"><a href="#">' + i + '</a></span>');
+        item = $('<span class="a-page-navigation-number"><a href="#">' + i + '</a></span>');
       }  
       item.data('page', i);

plugins/apostrophePlugin/trunk/modules/aPager/templates/_pager.php

@@ -7 +7 @@
 
 <?php if ($pager->haveToPaginate()): ?>
-<div class="a_pager_navigation">
+<div class="a-pager-navigation">
         <?php if ($pager->getPage() == 1):?>
-                <span class="a_pager_navigation_image a_pager_navigation_first a_pager_navigation_disabled"><?php echo __('First Page', null, 'apostrophe') ?></span>   
-          <span class="a_pager_navigation_image a_pager_navigation_previous a_pager_navigation_disabled"><?php echo __('Previous Page', null, 'apostrophe') ?></span>
+                <span class="a-pager-navigation-image a-pager-navigation-first a-pager-navigation-disabled"><?php echo __('First Page', null, 'apostrophe') ?></span>   
+          <span class="a-pager-navigation-image a-pager-navigation-previous a-pager-navigation-disabled"><?php echo __('Previous Page', null, 'apostrophe') ?></span>
         <?php else: ?>
-                <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => 1))) ?>" class="a_pager_navigation_image a_pager_navigation_first"><?php echo __('First Page', null, 'apostrophe') ?></a>
-        <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getPreviousPage()))) ?>" class="a_pager_navigation_image a_pager_navigation_previous"><?php echo __('Previous Page', null, 'apostrophe') ?></a>
+                <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => 1))) ?>" class="a-pager-navigation-image a-pager-navigation-first"><?php echo __('First Page', null, 'apostrophe') ?></a>
+        <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getPreviousPage()))) ?>" class="a-pager-navigation-image a-pager-navigation-previous"><?php echo __('Previous Page', null, 'apostrophe') ?></a>
         <?php endif ?>
 
   <?php foreach ($pager->getLinks() as $page): ?>
     <?php if ($page == $pager->getPage()): ?>
-      <span class="a_page_navigation_number a_pager_navigation_disabled"><?php echo $page ?></span>
+      <span class="a-page-navigation-number a-pager-navigation-disabled"><?php echo $page ?></span>
     <?php else: ?>
-      <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $page))) ?>" class="a_page_navigation_number"><?php echo $page ?></a>
+      <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $page))) ?>" class="a-page-navigation-number"><?php echo $page ?></a>
     <?php endif; ?>
   <?php endforeach; ?>
         <?php if ($pager->getPage() >= $pager->getLastPage()):?>
-          <span class="a_pager_navigation_image a_pager_navigation_next a_pager_navigation_disabled"><?php echo __('Next Page', null, 'apostrophe') ?></span>
-                <span class="a_pager_navigation_image a_pager_navigation_last a_pager_navigation_disabled"><?php echo __('Last Page', null, 'apostrophe') ?></span>     
+          <span class="a-pager-navigation-image a-pager-navigation-next a-pager-navigation-disabled"><?php echo __('Next Page', null, 'apostrophe') ?></span>
+                <span class="a-pager-navigation-image a-pager-navigation-last a-pager-navigation-disabled"><?php echo __('Last Page', null, 'apostrophe') ?></span>     
         <?php else: ?>
-          <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getNextPage()))) ?>" class="a_pager_navigation_image a_pager_navigation_next"><?php echo __('Next Page', null, 'apostrophe') ?></a>
-        <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getLastPage()))) ?>" class="a_pager_navigation_image a_pager_navigation_last"><?php echo __('Last Page', null, 'apostrophe') ?></a>
+          <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getNextPage()))) ?>" class="a-pager-navigation-image a-pager-navigation-next"><?php echo __('Next Page', null, 'apostrophe') ?></a>
+        <a href="<?php echo url_for(aUrl::addParams($pagerUrl, array('page' => $pager->getLastPage()))) ?>" class="a-pager-navigation-image a-pager-navigation-last"><?php echo __('Last Page', null, 'apostrophe') ?></a>
         <?php endif ?>
 </div>

plugins/apostrophePlugin/trunk/web/css/a.css

@@ -1989 +1989 @@
 -------------------------------------*/
 
-.a_pager_navigation
+.a-pager-navigation
 {
 float: left;
@@ -1999 +1999 @@
 }
 
-.a_pager_navigation a,
-.a_pager_navigation span
+.a-pager-navigation a,
+.a-pager-navigation span
 {
 display: inline;
@@ -2008 +2008 @@
 }
 
-.a_pager_navigation .a_page_navigation_number
+.a-pager-navigation .a-page-navigation-number
 {
 padding: 0 6px;
 }
 
-.a_pager_navigation span.a_page_navigation_number.a_pager_navigation_disabled
+.a-pager-navigation span.a-page-navigation-number.a-pager-navigation-disabled
 {
 background-color: #e2e2e2;
 }
 
-.a_pager_navigation a.a_page_navigation_number:hover
+.a-pager-navigation a.a-page-navigation-number:hover
 {
 color: #000;
@@ -2024 +2024 @@
 }
 
-.a_pager_navigation .a_pager_navigation_image
+.a-pager-navigation .a-pager-navigation-image
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat;
@@ -2034 +2034 @@
 }
 
-.a_pager_navigation a.a_pager_navigation_image.disabled
+.a-pager-navigation a.a-pager-navigation-image.disabled
 {
 cursor: default;
 }
 
-.a_pager_navigation a.a_pager_navigation_first
+.a-pager-navigation a.a-pager-navigation-first
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat top left;
@@ -2049 +2049 @@
 }
 
-.a_pager_navigation a.a_pager_navigation_first:hover
+.a-pager-navigation a.a-pager-navigation-first:hover
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat 0px -20px;
 }
-.a_pager_navigation a.a_pager_navigation_previous
+.a-pager-navigation a.a-pager-navigation-previous
 {
 background-position: -22px 0;
@@ -2060 +2060 @@
 margin-left:1px;
 }
-.a_pager_navigation a.a_pager_navigation_previous:hover
+.a-pager-navigation a.a-pager-navigation-previous:hover
 {
 background-position: -22px -40px !important;
 }
-.a_pager_navigation a.a_pager_navigation_next
+.a-pager-navigation a.a-pager-navigation-next
 {
 background-position: -41px 0;
@@ -2071 +2071 @@
 margin-right: 1px;
 }
-.a_pager_navigation a.a_pager_navigation_next:hover
+.a-pager-navigation a.a-pager-navigation-next:hover
 {
 background-position: -41px -60px;
 }
-.a_pager_navigation a.a_pager_navigation_last
+.a-pager-navigation a.a-pager-navigation-last
 {
 background-position: -60px 0;
@@ -2084 +2084 @@
 border-bottom-right-radius:10px;
 }
-.a_pager_navigation a.a_pager_navigation_last:hover
+.a-pager-navigation a.a-pager-navigation-last:hover
 {
 background-position: -60px -80px;
 }
 
-.a_pager_navigation span.a_pager_navigation_first.a_pager_navigation_disabled
+.a-pager-navigation span.a-pager-navigation-first.a-pager-navigation-disabled
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat 0px -20px;
@@ -2102 +2102 @@
 }
 
-.a_pager_navigation span.a_pager_navigation_previous.a_pager_navigation_disabled
+.a-pager-navigation span.a-pager-navigation-previous.a-pager-navigation-disabled
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat -22px -40px;
@@ -2113 +2113 @@
 }
 
-.a_pager_navigation span.a_pager_navigation_last.a_pager_navigation_disabled
+.a-pager-navigation span.a-pager-navigation-last.a-pager-navigation-disabled
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat;
@@ -2127 +2127 @@
 }
 
-.a_pager_navigation span.a_pager_navigation_next.a_pager_navigation_disabled
+.a-pager-navigation span.a-pager-navigation-next.a-pager-navigation-disabled
 {
 background: url(/apostrophePlugin/images/a-page-arrows.png) no-repeat -41px -60px;
@@ -2138 +2138 @@
 
 
-.a_pager_navigation a.a_pager_navigation_first,
-.a_pager_navigation a.a_pager_navigation_previous,
-.a_pager_navigation a.a_pager_navigation_next,
-.a_pager_navigation a.a_pager_navigation_last,
-.a_pager_navigation span.a_pager_navigation_first.a_pager_navigation_disabled,
-.a_pager_navigation span.a_pager_navigation_previous.a_pager_navigation_disabled,
-.a_pager_navigation span.a_pager_navigation_next.a_pager_navigation_disabled,
-.a_pager_navigation span.a_pager_navigation_last.a_pager_navigation_disabled
+.a-pager-navigation a.a-pager-navigation-first,
+.a-pager-navigation a.a-pager-navigation-previous,
+.a-pager-navigation a.a-pager-navigation-next,
+.a-pager-navigation a.a-pager-navigation-last,
+.a-pager-navigation span.a-pager-navigation-first.a-pager-navigation-disabled,
+.a-pager-navigation span.a-pager-navigation-previous.a-pager-navigation-disabled,
+.a-pager-navigation span.a-pager-navigation-next.a-pager-navigation-disabled,
+.a-pager-navigation span.a-pager-navigation-last.a-pager-navigation-disabled
 {
         background-color:#e2e2e2;
 }
 
-.a_pager_navigation a.a_pager_navigation_first:hover,
-.a_pager_navigation a.a_pager_navigation_previous:hover,
-.a_pager_navigation a.a_pager_navigation_next:hover,
-.a_pager_navigation a.a_pager_navigation_last:hover
+.a-pager-navigation a.a-pager-navigation-first:hover,
+.a-pager-navigation a.a-pager-navigation-previous:hover,
+.a-pager-navigation a.a-pager-navigation-next:hover,
+.a-pager-navigation a.a-pager-navigation-last:hover
 {
         background-color:#e2e2e2;