Skip to content
Permalink
Browse files

gimmick buttons; layout and translation improvements

  • Loading branch information...
following
following committed Feb 25, 2013
1 parent 9cad450 commit 7383b3fe77eaf3661c84031344863e42daf15228
Showing with 202 additions and 126 deletions.
  1. +31 −25 htdocs/doc/sql/static-data/data.sql
  2. +1 −1 htdocs/htmlprev.php
  3. +2 −2 htdocs/lang/de/ocstyle/editcache.tpl.php
  4. +2 −2 htdocs/lang/de/ocstyle/editdesc.tpl.php
  5. +2 −2 htdocs/lang/de/ocstyle/editlog.tpl.php
  6. +2 −2 htdocs/lang/de/ocstyle/log_cache.tpl.php
  7. +16 −0 htdocs/lang/de/ocstyle/main.tpl.php
  8. +2 −2 htdocs/lang/de/ocstyle/newcache.tpl.php
  9. +2 −2 htdocs/lang/de/ocstyle/newdesc.tpl.php
  10. 0 htdocs/lang/de/ocstyle/{ → old}/login.inc.php
  11. 0 htdocs/lang/de/ocstyle/{ → old}/login.tpl.php
  12. +1 −1 htdocs/lang/de/ocstyle/removelog_cacheowner.tpl.php
  13. +1 −1 htdocs/lang/de/ocstyle/removelog_logowner.tpl.php
  14. +18 −7 htdocs/lang/de/ocstyle/search.tpl.php
  15. +1 −1 htdocs/lang/de/ocstyle/varset.inc.php
  16. +38 −5 htdocs/resource2/ocstyle/css/style_screen.css
  17. +4 −4 htdocs/templates2/ocstyle/activation.tpl
  18. +3 −3 htdocs/templates2/ocstyle/adminreports.tpl
  19. +2 −2 htdocs/templates2/ocstyle/adminuser.tpl
  20. +2 −1 htdocs/templates2/ocstyle/adoptcache.tpl
  21. +1 −1 htdocs/templates2/ocstyle/cache_note.tpl
  22. +2 −2 htdocs/templates2/ocstyle/change_statpic.tpl
  23. +3 −3 htdocs/templates2/ocstyle/childwp.tpl
  24. +2 −2 htdocs/templates2/ocstyle/coordinate_input.tpl
  25. +2 −2 htdocs/templates2/ocstyle/dbmaintain.tpl
  26. +4 −4 htdocs/templates2/ocstyle/htmlprev.tpl
  27. +2 −2 htdocs/templates2/ocstyle/login.tpl
  28. +2 −2 htdocs/templates2/ocstyle/mailto.tpl
  29. +2 −2 htdocs/templates2/ocstyle/mydetails.tpl
  30. +1 −1 htdocs/templates2/ocstyle/myignores.tpl
  31. +2 −2 htdocs/templates2/ocstyle/myprofile.tpl
  32. +1 −1 htdocs/templates2/ocstyle/mytop5.tpl
  33. +3 −3 htdocs/templates2/ocstyle/mywatches.tpl
  34. +3 −3 htdocs/templates2/ocstyle/newemail.tpl
  35. +3 −3 htdocs/templates2/ocstyle/newpw.tpl
  36. +1 −1 htdocs/templates2/ocstyle/newstopic.tpl
  37. +3 −2 htdocs/templates2/ocstyle/picture.tpl
  38. +2 −2 htdocs/templates2/ocstyle/query.tpl
  39. +4 −3 htdocs/templates2/ocstyle/register.tpl
  40. +1 −1 htdocs/templates2/ocstyle/remindemail.tpl
  41. +2 −2 htdocs/templates2/ocstyle/reportcache.tpl
  42. +18 −2 htdocs/templates2/ocstyle/sys_main.tpl
  43. +3 −3 htdocs/templates2/ocstyle/translate.tpl
  44. +2 −2 htdocs/templates2/ocstyle/verifyemail.tpl
  45. +1 −1 htdocs/templates2/ocstyle/viewprofile.tpl
  46. +2 −11 htdocs/verifyemail.php

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -15,7 +15,7 @@
$the_html = isset($_REQUEST['thehtml']) ? $_REQUEST['thehtml'] : '';
$step = isset($_REQUEST['step']) ? $_REQUEST['step']+0 : 1;
if (isset($_REQUEST['toStep2']))
if (isset($_REQUEST['toStep2a']) || isset($_REQUEST['toStep2b']))
{
$tpl->assign('step', 2);
@@ -356,8 +356,8 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons"/>&nbsp;&nbsp;
<input type="submit" name="submit" value="{submit}" class="formbuttons"/>
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submit" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submit')" />
</td>
</tr>
</table>
@@ -107,8 +107,8 @@
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons"/>&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbuttons"/>
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submitform')" />
</td>
</tr>
</table>
@@ -149,8 +149,8 @@ function _chkFound () {
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons"/>&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbuttons"/>
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submitform')" />
</td>
</tr>
</table>
@@ -143,8 +143,8 @@ function _chkFound () {
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons"/>&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbuttons"/>
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submitform')" />
</td>
</tr>
</table>
@@ -90,6 +90,22 @@ function usercountry_change()
window.location = 'index.php?usercountry=' + oUserCountryCombo.value;
}
}
function submitbutton(bname)
{
document.getElementsByName(bname)[0].className = "formbutton_active";
}
function resetbutton(bname)
{
document.getElementsByName(bname)[0].className = "formbutton"
}
function flashbutton(bname)
{
document.getElementsByName(bname)[0].className = "formbutton_active";
window.setTimeout('resetbutton(\'' + bname + '\')', 350);
}
//-->
</script>
<link rel="stylesheet" type="text/css" media="print" href="resource2/{style}/css/style_print.css">
@@ -399,8 +399,8 @@ function toggleAttr(id)
<tr><td class="spacer" colspan="2"></td></tr>
<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons"/>&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbuttons"/>
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submitform') "/>
</td>
</tr>
</table>
@@ -103,8 +103,8 @@

<tr>
<td class="header-small" colspan="2">
<input type="reset" name="reset" value="{reset}" class="formbuttons" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbuttons" />
<input type="reset" name="reset" value="{reset}" class="formbutton" onclick="javascript:flashbutton('reset')" />&nbsp;&nbsp;
<input type="submit" name="submitform" value="{submit}" class="formbutton" onclick="javascript:submitbutton('submitform')" />
</td>
</tr>
</table>
File renamed without changes.
File renamed without changes.
@@ -50,7 +50,7 @@

<tr>
<td class="header-small" colspan="2">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" class="formbuttons" style="width: 150px;"/>
<input type="submit" name="submit" value="{t}Remove log entry{/t}" class="formbutton" style="width: 150px;" onclick="javascript:submitbutton('submit')" />
</td>
</tr>
</table>
@@ -46,7 +46,7 @@

<tr>
<td class="header-small" colspan="2">
<input type="submit" name="submit" value="{t}Remove log entry{/t}" class="formbuttons" style="width: 150px;"/>
<input type="submit" name="submit" value="{t}Remove log entry{/t}" class="formbutton" style="width: 150px;" onclick="javascript:submitbutton('submit')" />
</td>
</tr>
</table>
@@ -27,6 +27,7 @@ function _sbn_click()
if (document.searchbyname.cachename.value == "")
{
alert("{t}Enter a name, please!{/t}");
resetbutton('submit_cachename');
return false;
}
return true;
@@ -37,6 +38,7 @@ function _sbft_click()
if (document.searchbyfulltext.fulltext.value == "")
{
alert("{t}Fill out the text field, please!{/t}");
resetbutton('submit_ft');
return false;
}
@@ -46,6 +48,7 @@ function _sbft_click()
(document.searchbyfulltext.ft_pictures.checked == false))
{
alert("{t}You have to check at least one field!{/t}");
resetbutton('submit_ft');
return false;
}
@@ -57,21 +60,25 @@ function _sbd_click()
if (isNaN(document.searchbydistance.lon_h.value) || isNaN(document.searchbydistance.lon_min.value))
{
alert("{t}Longitude has to be a number!\nFormat: hh° mm.mmm{/t}");
resetbutton('submit_dist');
return false;
}
else if (isNaN(document.searchbydistance.lat_h.value) || isNaN(document.searchbydistance.lat_min.value))
{
alert("{t}Latitude has to be a number!\nFormat: hh° mm.mmm{/t}");
resetbutton('submit_dist');
return false;
}
else if (isNaN(document.searchbydistance.distance.value))
{
alert("{t}The maximum distance has to be a number!{/t}");
resetbutton('submit_dist');
return false;
}
else if (document.searchbydistance.distance.value <= 0 || document.searchbydistance.distance.value > 9999)
{
alert("{t}The distance has to be between 0 and 9999{/t}");
resetbutton('submit_dist');
return false;
}
return true;
@@ -82,6 +89,7 @@ function _sbplz_click()
if (document.searchbyplz.plz.value == "")
{
alert("{t}Enter the postal code, please!{/t}");
resetbutton('submit_plz');
return false;
}
return true;
@@ -92,6 +100,7 @@ function _sbort_click()
if (document.searchbyort.ort.value == "")
{
alert("{t}Enter the city, please!{/t}");
resetbutton('submit_city');
return false;
}
return true;
@@ -102,6 +111,7 @@ function _sbo_click()
if (document.searchbyowner.owner.value == "")
{
alert("{t}Enter the owner, please!{/t}");
resetbutton('submit_owner');
return false;
}
return true;
@@ -112,6 +122,7 @@ function _sbf_click()
if (document.searchbyfinder.finder.value == "")
{
alert("{t}Enter the username, please!{/t}");
resetbutton('submit_finder');
return false;
}
return true;
@@ -461,7 +472,7 @@ function switchAttributeCat2()
<tr>
<td>{t}Name:{/t}</td>
<td><input type="text" name="cachename" value="{cachename}" class="input200" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_cachename" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_cachename')" /></td>
</tr>
<tr><td class="spacer" colspan="3"></td></tr>
</table>
@@ -534,7 +545,7 @@ function switchAttributeCat2()
<option value="nm" {sel_nm}>{t}Seamiles{/t}</option>
</select>
</td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_dist" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_dist')" /></td>
</tr>
<tr><td class="spacer" colspan="3"></td></tr>
</table>
@@ -592,7 +603,7 @@ function switchAttributeCat2()
<tr>
<td>{t}Postal code:{/t}</td>
<td><input type="text" name="plz" value="{plz}" maxlength="5" class="input50" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_plz" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_plz')" /></td>
</tr>
</table>
</form>
@@ -630,7 +641,7 @@ function switchAttributeCat2()
<tr>
<td>{t}City:{/t}</td>
<td><input type="text" name="ort" value="{ort}" class="input200" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_city" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_city')" /></td>
</tr>
</table>
</form>
@@ -687,7 +698,7 @@ function switchAttributeCat2()
<tr>
<td>Text:</td>
<td><input type="text" name="fulltext" value="{fulltext}" class="input200" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_ft" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_ft')" /></td>
</tr>
<tr>
<td></td>
@@ -750,7 +761,7 @@ function switchAttributeCat2()
<tr>
<td>{t}Owner:{/t}</td>
<td><input type="text" name="owner" value="{owner}" maxlength="40" class="input200" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_owner" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_owner')" /></td>
</tr>
<tr><td class="spacer" colspan="3"></td></tr>
</table>
@@ -806,7 +817,7 @@ function switchAttributeCat2()
<tr>
<td>{t}Username:{/t}</td>
<td><input type="text" name="finder" value="{finder}" maxlength="40" class="input200" /></td>
<td><input type="submit" value="{t}Search{/t}" class="formbuttons" /></td>
<td><input type="submit" name="submit_finder" value="{t}Search{/t}" class="formbutton" onclick="javascript:submitbutton('submit_finder')" /></td>
</tr>
<tr><td class="spacer" colspan="3"></td></tr>
</table>
@@ -26,7 +26,7 @@
tpl_set_var('runtime', '');
//set up main template specific string
$sLoggedOut = '<form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;">' . t('User') . ':&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;' . t('Password') . ':&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="submit" name="LogMeIn" value="' . t('Login') . '" class="formbuttons" style="width: 60px;" /></form>';
$sLoggedOut = '<b><form action="login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;">' . t('User') . ':&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;' . t('Password') . ':&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="submit" name="LogMeIn" value="' . t('Login') . '" class="formbutton_header" style="width: 65px;" onclick="javascript:submitbutton(\'LogMeIn\')"/></form></b>';
$sLoggedIn = "<b>" . t('Logged in as') . ':</b> <a href="myhome.php">{username}</a> - <a href="login.php?action=logout">' . t('Logout') . '</a>';
// target in Loginbox setzen
@@ -325,8 +325,6 @@ div.changelog ul li {margin: 0px 0px 0.1em 0px; }
.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%;}

.input_coord td {white-space:nowrap;}

/* Images */
.img-left-noborder-notopmargin {float: left; margin: 0px 10px 0px 0px;}
.img-left-noborder-topmargin {float: left; margin: 3px 10px 0px 0px;}
@@ -337,6 +335,11 @@ div.changelog ul li {margin: 0px 0px 0.1em 0px; }
.img-right-border-notopmargin {float: right; margin: 0px 0px 0px 10px; border: solid 1px rgb(150,150,150);}
.img-right-border-topmargin {float: right; margin: 3px 0px 0px 10px; border: solid 1px rgb(150,150,150);}

/* Other */
div.default {
font-size:110%;
}

/*--------------------*/
/* 6.2 - Sidebar Area */
/*--------------------*/
@@ -600,21 +603,46 @@ input.radio {border:0px; border-width: 0px; width:12px; height:12px; background-

select {border:1px solid black; background-color:white; padding:1px; font-size:12px; color: black;}

input.formbuttons {
input.formbutton_header {
width:65px;
border:1px solid black;
background-color:#dbe6f1;
color: #000000;
padding:0;
}

input.formbutton {
width:120px;
border:1px solid #5f90bb;
padding:0px;
padding:2px 0px 2px 0;
background-color:#dbe6f1;
color: #000000;
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
}

input.formbuttons:hover {
input.formbutton:hover {
background-color:#e5eef5;
box-shadow: 0px 0px 2px #555;
-moz-box-shadow: 0px 0px 2px #555;
-webkit-box-shadow: 0px 0px 2px #555;
}

input.formbutton_active {
width:120px;
border:1px solid #ffe9c5;
padding:2px 0px 2px 0;
color: #000000;
background-color:#ffe9c5;
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
box-shadow: 0px 0px 2px #555;
-moz-box-shadow: 0px 0px 2px #555;
-webkit-box-shadow: 0px 0px 2px #555;
}

.menuBar
{
background-color:#F0F0EE;
@@ -1069,6 +1097,7 @@ td.mapsearch-c {

.mapfilter {
border: solid 1px rgb(219,230,241);
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
margin: 3px;
@@ -1169,6 +1198,7 @@ div.logs {
margin: 0 0 10px 0;
padding: 3px 5px 5px 5px;
background: #fff url(../images/misc/bg-gradient-blue.png) repeat-x top left;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
@@ -1191,8 +1221,10 @@ div.searchdiv {
width: 94%;
margin: 5px;
padding: 5px; border: solid 1px rgb(219,230,241);
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.pad5 { padding: 5px; }
@@ -1207,6 +1239,7 @@ div.isarchived {
margin: 0px 0px 10px 0px;
padding: 15px;
border: solid 2px red;
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
Oops, something went wrong.

0 comments on commit 7383b3f

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