summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-20 05:07:58 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-20 05:07:58 +0200
commitd9aae20003eb670b7bf86708016473969088066a (patch)
treee51450959802c1d32ecbcdeb0036efdc0842c2d1 /core
parentc2f0fe51c427374e918b72c28c521df27e614cae (diff)
downloadnextcloud-server-d9aae20003eb670b7bf86708016473969088066a.tar.gz
nextcloud-server-d9aae20003eb670b7bf86708016473969088066a.zip
more valid HTML, alt attributes, refactored pagenavi etc.
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css5
-rw-r--r--core/templates/layout.user.php4
-rw-r--r--core/templates/part.pagenavi.php53
3 files changed, 28 insertions, 34 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index ea8db3544a5..a1838b38f68 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -101,10 +101,13 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
-#body-settings .personalblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+#body-settings .personalblock, .pager li { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
#body-settings .personalblock#quota { position:relative; margin-top:4.5em; padding:0; }
#quota div, div.jp-play-bar, div.jp-seek-bar { padding:.6em 1em; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
div.jp-play-bar, div.jp-seek-bar { padding:0; }
+.pager { list-style:none; margin:0 1em; float:right; }
+.pager li { display:inline-block; margin:0; }
+
li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index c8b276bebb6..90b19259292 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -31,7 +31,7 @@
<form class="searchbox" action="#" method="post">
<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" />
</form>
- <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
+ <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
</div></header>
<nav><div id="navigation">
@@ -43,7 +43,7 @@
</ul>
<ul id="settings" class="svg">
- <img id="expand" class="svg" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
+ <img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
<span style="display:none"><?php echo $l->t('Settings');?></span>
<div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
index 23008058757..d43023a7822 100644
--- a/core/templates/part.pagenavi.php
+++ b/core/templates/part.pagenavi.php
@@ -1,31 +1,22 @@
-<center>
- <table class="pager" cellspacing="0" cellpadding="0" border="0">
- <tr><td width="50%"></td>
- <td width="1">
- <?php if($_['page']>0):?>
- <span class="pagerbutton1"><a href="<?php echo $_['url'].($_['page']-1);?>"><?php echo $l->t( 'prev' ); ?></a>&nbsp;&nbsp;</span>
- <?php endif; ?>
- </td>
- <td width="1">
- <?php if ($_['pagestart']>0):?>
- ...
- <?php endif;?>
- <?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
- <?php if ($_['page']!=$i):?>
- <a href="<?php echo $_['url'].$i;?>"><?php echo $i+1;?>&nbsp;</a>
- <?php else:?>
- <?php echo $i+1;?>&nbsp;
- <?php endif?>
- <?php endfor;?>
- <?php if ($_['pagestop']<$_['pagecount']):?>
- ...
- <?php endif;?>
- </td>
- <td width="1">
- <?php if(($_['page']+1)<$_['pagecount']):?>
- <span class="pagerbutton2"><a href="<?php echo $_['url'].($_['page']+1);?>"><?php echo $l->t( 'next' ); ?></a></span>
- <?php endif; ?>
- </td>
- <td width="50%"></td></tr>
- </table>
-</center>
+<ol class="pager">
+ <?php if($_['page']>0):?>
+ <li class="pagerbutton1"><a href="<?php echo $_['url'].($_['page']-1);?>"><?php echo $l->t( 'prev' ); ?></a></li>
+ <?php endif; ?>
+ <?php if ($_['pagestart']>0):?>
+ &hellip;
+ <?php endif;?>
+ <?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
+ <?php if ($_['page']!=$i):?>
+ <li><a href="<?php echo $_['url'].$i;?>"><?php echo $i+1;?></a></li>
+ <?php else:?>
+ <li><?php echo $i+1;?></li>
+ <?php endif?>
+ <?php endfor;?>
+ <?php if ($_['pagestop']<$_['pagecount']):?>
+ &hellip;
+ <?php endif;?>
+
+ <?php if(($_['page']+1)<$_['pagecount']):?>
+ <li class="pagerbutton2"><a href="<?php echo $_['url'].($_['page']+1);?>"><?php echo $l->t( 'next' ); ?></a></li>
+ <?php endif; ?>
+</ol>