Skip to content
Permalink
Browse files

design improvements for new caches and new logs lists

  • Loading branch information...
following
following committed Mar 21, 2013
1 parent bf12904 commit 5fcc1f1371c4c372495a8b3f72bfd5cf76af1e85
@@ -834,7 +834,7 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('3', 'MNU_START_REGISTER', 'Register', '18', 'Register', '18', '0', 'register.php', '1', '1', '3', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('4', 'MNU_START_NEWS', 'News', '70', 'News', '70', '0', 'news.php', '0', '1', '3', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('5', 'MNU_START_NEWCACHES', 'New caches', '122', 'New caches', '122', '0', 'newcaches.php', '1', '1', '4', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('6', 'MNU_START_NEWCACHES_WITHOUTOWN', 'Without Germany', '121', 'Without Germany', '121', '0', 'newcachesrest.php', '1', '5', '1', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('6', 'MNU_START_NEWCACHESREST', 'Without Germany', '121', 'Without Germany', '121', '0', 'newcachesrest.php', '1', '5', '1', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('7', 'MNU_START_NEWLOGS', 'New logs', '120', 'New logs', '120', '0', 'newlogs.php', '1', '1', '5', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('8', 'MNU_START_IMPRINT', 'Imprint', '15', 'Imprint', '15', '0', 'articles.php?page=impressum', '1', '1', '11', '', '1', NULL);
INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('9', 'MNU_MYPROFILE', 'My profile', '119', 'My profile', '119', '0', 'myhome.php', '1', '0', '2', '#E8DDE4', '1', NULL);
@@ -2597,7 +2597,7 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57',
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/map2.tpl', '1131');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/myhome.tpl', '30');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/newcaches.tpl', '44');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/newcaches_withoutown.tpl', '20');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/newcachesrest.tpl', '20');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/recommendations.tpl', '39');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/start.tpl', '53');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('57', './templates2/ocstyle/start.tpl', '93');
@@ -2630,8 +2630,8 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('70',
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('70', 'table:sys_menu;field=title', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('71', './templates2/ocstyle/newcaches.tpl', '8');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('71', './templates2/ocstyle/newcaches.tpl', '9');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('72', './templates2/ocstyle/newcaches_withoutown.tpl', '8');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('72', './templates2/ocstyle/newcaches_withoutown.tpl', '9');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('72', './templates2/ocstyle/newcachesrest.tpl', '8');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('72', './templates2/ocstyle/newcachesrest.tpl', '9');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('73', './templates2/ocstyle/newlogpics.tpl', '8');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('73', './templates2/ocstyle/newlogs.tpl', '8');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('73', './templates2/ocstyle/newlogs.tpl', '9');
@@ -360,6 +360,7 @@ function toggleAttr(id)
<input type="submit" name="submit" value="{submit}" class="formbutton" onclick="submitbutton('submit')" />
</td>
</tr>
<tr><td class="spacer"></td></tr>
</table>
</form>
<script type="text/javascript">
@@ -403,6 +403,7 @@ function toggleAttr(id)
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="submitbutton('submitform') "/>
</td>
</tr>
<tr><td class="spacer"></td></tr>
</table>
</form>
<script language="javascript" type="text/javascript">
@@ -27,13 +27,10 @@
$newCaches = array();
$rsNewCaches = sql_slave('SELECT `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`, `user`.`user_id` `userid`, `caches`.`country` `country`, `caches`.`name` `cachename`, `user`.`username` `username`, `caches`.`date_created` `date_created`, `cache_type`.`icon_large` FROM `caches` INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id` INNER JOIN `cache_type` ON `caches`.`type`=`cache_type`.`id` WHERE `caches`.`status` = 1 ORDER BY `caches`.`date_created` DESC LIMIT ' . ($startat+0) . ', ' . ($perpage+0));
$rsNewCaches = sql_slave('SELECT `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`, `user`.`user_id` `userid`, `caches`.`country` `country`, `caches`.`name` `cachename`, `caches`.`type`, `user`.`username` `username`, `caches`.`date_created` `date_created` FROM `caches` INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id` WHERE `caches`.`status` = 1 ORDER BY `caches`.`date_created` DESC LIMIT ' . ($startat+0) . ', ' . ($perpage+0));
// see also write_newcaches_urls() in sitemap.class.php
while ($rNewCache = sql_fetch_assoc($rsNewCaches))
{
$rNewCache['icon_large'] = getSmallCacheIcon($rNewCache['icon_large']);
$newCaches[] = $rNewCache;
}
sql_free_result($rsNewCaches);
$tpl->assign('newCaches', $newCaches);
@@ -59,6 +56,7 @@
$tpl->assign('startat', $startat);
$tpl->assign('maxstart', $maxstart);
$tpl->assign('defaultcountry', $opt['template']['default']['country']);
}
$tpl->display();
@@ -6,8 +6,8 @@
***************************************************************************/
require('./lib2/web.inc.php');
$tpl->name = 'newcaches_withoutown';
$tpl->menuitem = MNU_START_NEWCACHES_WITHOUTOWN;
$tpl->name = 'newcachesrest';
$tpl->menuitem = MNU_START_NEWCACHESREST;
$tpl->caching = true;
$tpl->cache_lifetime = 3600;
@@ -21,7 +21,7 @@
sql_temp_table_slave('cachelist');
sql_slave("CREATE TEMPORARY TABLE &cachelist (`cache_id` INT(11) PRIMARY KEY) SELECT `cache_id` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` WHERE `cache_status`.`allow_user_view`=1 AND `country`!='DE' ORDER BY `date_created` DESC LIMIT 200");
$rsNewCaches = sql_slave("SELECT IFNULL(`sys_trans_text`.`text`, `countries`.`name`) `country_name`, `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`, `user`.`user_id` `userid`, `caches`.`country` `country`, `caches`.`name` `cachename`, `user`.`username` `username`, `caches`.`date_created` `date_created`, `cache_type`.`icon_large` `icon_large`
$rsNewCaches = sql_slave("SELECT IFNULL(`sys_trans_text`.`text`, `countries`.`name`) `country_name`, `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`, `user`.`user_id` `userid`, `caches`.`country` `country`, `caches`.`name` `cachename`, `caches`.`type`, `caches`.`country` `country`, `user`.`username` `username`, `caches`.`date_created` `date_created`, `cache_type`.`icon_large` `icon_large`
FROM `caches`
INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
INNER JOIN `cache_type` ON `caches`.`type`=`cache_type`.`id`
@@ -27,6 +27,7 @@
`cache_logs`.`date_created`,
`caches`.`name` AS `cachename`,
`caches`.`wp_oc`,
`caches`.`country` AS `country`,
`cache_logs`.`type`,
`cacheloguser`.`user_id`,
`cacheloguser`.`username`,
@@ -255,6 +255,7 @@ ul#statmenu { padding: 0px; margin: 0px;}
.content-title-noshade {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 100%;}
.content-title-noshade-size0 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 70%;}
.content-title-noshade-size05 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 80%;}
.content-title-noshade-size08 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 110%;}
.content-title-noshade-size1 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 130%;}
.content-title-noshade-size15 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 136%;}
.content-title-noshade-size2 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 150%;}
@@ -267,6 +268,13 @@ ul#statmenu { padding: 0px; margin: 0px;}
}
.content-title-noshade-size5 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 200%;}

td.content-title-flag {
margin-left:0 !important;
padding-left:0 !important;
margin-right:3px !important;
padding-right:3px !important;
}

.content-txtbox-noshade {margin: 0px; padding: 7px 0px 0px 0px; background-color: rgb(255,255,255);}
.content-score {margin: 0px; margin-top: 3px; padding: 4px 0px 0px 0px; background-color: rgb(255,255,255); border-style:dotted; border-width:1px; width:75px; height:20px;vertical-align:middle;}

@@ -318,6 +326,13 @@ div.changelog ul li ul {font-size: 90%; margin:0}
.narrowtable th {margin: 0px; background-color: rgb(127,162,202); padding: 0 7px 0 7px; border: solid 0px rgb(150,150,150); empty-cells: show; text-align: left; font-size: 120%; color: rgb(255,255,255); }
.narrowtable-caption {margin: 0.5em 0px 1.0em 30px; padding: 0px; clear: both; text-align: left; font-size: 120%;}

td.listicon {
width:1%;
margin-right:0 !important;
padding-right:1px !important;
vertical-align:center;
}

/* Images */
.img-left-noborder-notopmargin {float: left; margin: 0px 10px 0px 0px;}
.img-left-noborder-topmargin {float: left; margin: 3px 10px 0px 0px;}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2142,7 +2142,7 @@ function toggle_attribselection(bSaveCookies)
{* popup box for permalink *}
<div id="permalink_box" class="mappermalink mapboxframe mapboxshadow" style="display:none">
<table>
<tr><td><img src="resource2/ocstyle/images/viewcache/link.png" alt="" height="16" width="16" /> {t}Link to this map view{/t}:</td><td align="right"><a href="javascript:permalinkbox_hide()"><img src="resource2/ocstyle/images/navigation/close-medium.png" style="opacity:0.7" ></a></td></tr>
<tr><td><img src="resource2/ocstyle/images/viewcache/link.png" alt="" height="16" width="16" /> {t}Link to this map view{/t}:</td><td align="right"><a href="javascript:permalinkbox_hide()"><img src="resource2/ocstyle/images/navigation/19x19-close.png" style="opacity:0.7" ></a></td></tr>
<tr><td><input id="permalink_text" type="text" value="" size="55"/></td></tr>
<tr id="permalink_addFavorites"><td align="right"><input type="button" value="{t}Add to favorites...{/t}" onclick="addFavorites_click()" /></td></tr>
</table>
@@ -2172,7 +2172,7 @@ function toggle_attribselection(bSaveCookies)
<form action="map2.php?mode={if $bFullscreen}full{else}normal{/if}screen" method="post" style="display:inline;">
<input type="hidden" name="submit" value="1" />
<table>
<tr><td><span style="font-size:1.2em; font-weight:bold">{t}Settings{/t}</strong></td><td style="text-align:right"><a href="javascript:toggle_settings()"><img src="resource2/ocstyle/images/navigation/close-medium.png" style="opacity:0.7" /></a></tr>
<tr><td><span style="font-size:1.2em; font-weight:bold">{t}Settings{/t}</strong></td><td style="text-align:right"><a href="javascript:toggle_settings()"><img src="resource2/ocstyle/images/navigation/19x19-close.png" style="opacity:0.7" /></a></tr>
<tr><td>{t}Menu option 'Map' shows{/t}:</td><td><select name="opt_menumap"><option id="opt_menumap0" value="0">{t}small map{/t}</option><option id="opt_menumap1" value="1">{t}fullscreen map{/t}</option></select></td></tr>
<tr><td>{t}Show overview map{/t}:</td><td><input type="checkbox" id="opt_overview" name="opt_overview" value="1" /></td></tr>
<tr><td>{t 1=$min_maxrecords 2=$max_maxrecords}Maximum caches on map<br />(%1-%2, 0=automatic){/t}:</td><td><input type="text" id="opt_maxcaches" name="opt_maxcaches" size="6" /></td></tr>
@@ -2191,7 +2191,7 @@ function toggle_attribselection(bSaveCookies)
<div id="cachepicbox" class="default mapboxframe mapboxshadow" style="position:absolute; {if $bFullscreen}left:4px; top:7px;{else}left:0; top:0;{/if} background:#fdfdfd; display:none; z-index:60">
<div style="position:absolute; right:-19px; top:2px; opacity:0.7">
<img src="resource2/ocstyle/images/navigation/close-smaller.png" onclick="hide_picture()" style="cursor:pointer"/>
<img src="resource2/ocstyle/images/navigation/15x15-smallclose.png" onclick="hide_picture()" style="cursor:pointer"/>
</div>
<div>
<a id="cachepiccontainer" class="nooutline"><img id="cachepic"/></a>
@@ -11,38 +11,44 @@

<table width="100%" class="table">
<tr>
<td class="header-small">
<td colspan="3" class="header-small">
{include file="res_browse_left.tpl" page="newcaches"}

{section name=page start=$firstpage loop=$lastpage+1 step=100}
{if $smarty.section.page.index!=$startat}
<a href="newcaches.php?startat={$smarty.section.page.index}">{$smarty.section.page.index/$perpage+1}</a>
{else}
{$smarty.section.page.index/$perpage+1}
<b>{$smarty.section.page.index/$perpage+1}</b>
{/if}
{/section}

{include file="res_browse_right.tpl" page="newcaches"}
</td>
</tr>
<tr><td class="spacer"></td></tr>

{foreach name=newCaches from=$newCaches item=newCache}
<tr><td>{$newCache.date_created|date_format:$opt.format.date} ({$newCache.country}): <img src="resource2/{$opt.template.style}/images/cacheicon/{$newCache.icon_large}" width="16" height="16" border="0" alt="Cache" title="Cache" style="margin-top:4px;" /> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a></td></tr>
<tr>
<td style="width:1%; vertical-align:center">{$newCache.date_created|date_format:$opt.format.date}</td>
<td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td style="vertical-align:center"> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a> {if $newCache.country != $defaultcountry}&nbsp;&nbsp;<img src="images/flags/{$newCache.country|lower}.gif" width="16px" height="11px">{/if} </td>
</tr>
{/foreach}

<tr><td class="spacer"></td></tr>
<tr>
<td class="header-small">
<td colspan="3" class="header-small">
{include file="res_browse_left.tpl" page="newcaches"}

{section name=page start=$firstpage loop=$lastpage+1 step=100}
{if $smarty.section.page.index!=$startat}
<a href="newcaches.php?startat={$smarty.section.page.index}">{$smarty.section.page.index/$perpage+1}</a>
{else}
{$smarty.section.page.index/$perpage+1}
<b>{$smarty.section.page.index/$perpage+1}</b>
{/if}
{/section}

{include file="res_browse_right.tpl" page="newcaches"}
</td>
</tr>
<tr><td class="spacer"></td></tr>
</table>

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,31 @@
{***************************************************************************
* You can find the license in the docs directory
*
* Unicode Reminder メモ
***************************************************************************}
{* OCSTYLE *}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/cacheicon/traditional.gif" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Latest caches without germany{/t}" />
{t}Latest caches without germany{/t}
</div>

<table width="100%" class="table">
{assign var='lastCountry' value=''}

{foreach name=newCaches from=$newCaches item=newCache}
{if $newCache.country_name!=$lastCountry}
<tr><td class="spacer"></td></tr>
<tr>
<td colspan="3">
<table cellspacing="0" cellpadding="0"><tr>
<td class="content-title-flag"><img src="images/flags/{$newCache.country|lower}.gif" width="16px" height="11px"></td>
<td><p class="content-title-noshade-size08">{$newCache.country_name|escape}</p></td>
</tr></table>
<td>
</tr>
{/if}
<tr><td width="1%">{$newCache.date_created|date_format:$opt.format.date}</td><td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td><a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a></td></tr>
{assign var='lastCountry' value=$newCache.country_name}
{/foreach}
<tr><td class="spacer"></td></tr>
</table>
Oops, something went wrong.

0 comments on commit 5fcc1f1

Please sign in to comment.
You can’t perform that action at this time.