Revision: 6636
http://care2002.svn.sourceforge.net/care2002/?rev=6636&view=rev
Author: mizuko
Date: 2010-07-22 11:19:22 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
see #65 - start ui restyling
Modified Paths:
--------------
care2x/branches/gettext/gui/css/themes/default/default.css
care2x/branches/gettext/gui/smarty_template/templates/default/common/header_topblock.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/main/login_config.tpl
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
care2x/branches/gettext/include/helpers/inc_init_main.php
care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
care2x/branches/gettext/main/login-pc-config.php
care2x/branches/gettext/main/logout_confirm.php
Modified: care2x/branches/gettext/gui/css/themes/default/default.css
===================================================================
--- care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-21
17:10:13 UTC (rev 6635)
+++ care2x/branches/gettext/gui/css/themes/default/default.css 2010-07-22
11:19:22 UTC (rev 6636)
@@ -387,7 +387,7 @@
/* Gjergj Sheldija - new buttons top */
.buttons a, .buttons button{
- float:right;
+ float:left;
display:block;
margin:0 7px 0 0;
background-color:#f5f5f5;
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/common/header_topblock.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/common/header_topblock.tpl
2010-07-21 17:10:13 UTC (rev 6635)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/common/header_topblock.tpl
2010-07-22 11:19:22 UTC (rev 6636)
@@ -1,5 +1,5 @@
{{* Toolbar - Topblock *}}
-<div class="buttons">
+
<table cellspacing="0" class="titlebar" border=0>
<tr valign=top class="titlebar" >
<td bgcolor="{{$top_bgcolor}}" >
@@ -9,12 +9,13 @@
{{/if}}
</td>
<td bgcolor="{{$top_bgcolor}}" align=right>
+ <div class="buttons" style="float:right">
{{if $pbAux2}}<a href="{{$pbAux2}}" class="regular"><img
{{$gifAux2}} alt=""></a>{{/if}}
{{if $pbAux1}}<a href="{{$pbAux1}}" class="regular"><img
{{$gifAux1}} alt=""></a>{{/if}}
{{if $pbBack}}<a href="{{$pbBack}}" class="regular"><img
{{$gifBack2}} alt="">{{$LDBack}}</a>{{/if}}
{{if $pbHelp}}<a href="{{$pbHelp}}" class="regular"><img
{{$gifHilfeR}} alt="">{{$LDHelp}}</a>{{/if}}
{{if $breakfile}}<a href="{{$breakfile}}" {{$sCloseTarget}}
class="negative"><img {{$gifClose2}}
alt="{{$LDCloseAlt}}">{{$LDClose}}</a>{{/if}}
+ </div>
</td>
</tr>
- </table>
- </div>
\ No newline at end of file
+ </table>
\ No newline at end of file
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/main/login_config.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/main/login_config.tpl
2010-07-21 17:10:13 UTC (rev 6635)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/main/login_config.tpl
2010-07-22 11:19:22 UTC (rev 6636)
@@ -70,12 +70,13 @@
</tr>
</tbody>
</table>
- <p>
- {{* Do not move the following elements outside the <form></form> block
*}}
-
- {{$sHiddenInputs}}
- {{$sSubmitFormButton}} {{$sNoChangeButton}} {{$sCancelButton}}
-
+ <br />
+ <div class="buttons">
+ {{* Do not move the following elements outside the
<form></form> block *}}
+
+ {{$sHiddenInputs}}
+ {{$sSubmitFormButton}}{{$sNoChangeButton}}{{$sCancelButton}}
+ </div>
</form>
</ul>
\ No newline at end of file
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
2010-07-21 17:10:13 UTC (rev 6635)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/main/passcheck_entry_mask.tpl
2010-07-22 11:19:22 UTC (rev 6636)
@@ -38,8 +38,8 @@
<p>
<form {{$sPassFormParams}}>
<div class="prompt">
-
{{$LDPwNeeded}}!<p>
-
</div>
+
{{$LDPwNeeded}}!
+
</div><br />
<label for="username">{{$LDUserPrompt}}:</label>
<input type="text" name="userid" size="14"
maxlength="25" id="username"> <p>
<label for="username">{{$LDPwPrompt}}:</label>
@@ -49,7 +49,8 @@
{{$sPassHiddenInputs}}
<div class="buttons">
-
{{$sPassSubmitButton}} {{$sCancelButton}}
+
{{$sPassSubmitButton}}
+
{{$sCancelButton}}
</div>
</form>
Modified: care2x/branches/gettext/include/helpers/inc_init_main.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_init_main.php 2010-07-21
17:10:13 UTC (rev 6635)
+++ care2x/branches/gettext/include/helpers/inc_init_main.php 2010-07-22
11:19:22 UTC (rev 6636)
@@ -1,12 +1,12 @@
<?php
# This is the database name
-$dbname='care2x_26RC';
+$dbname='care2x_gettext';
# Database user name, default is root or httpd for mysql, or postgres for
postgresql
$dbusername='root';
# Database user password, default is empty char
-$dbpassword='';
+$dbpassword='root';
# Database host name, default = localhost
$dbhost='localhost';
@@ -21,10 +21,10 @@
$key_login='2.9647067937614E+28';
# Main host address or domain
-$main_domain='localhost/care2x_26RC/';
+$main_domain='localhost/gettext/care2002/care2x/branches/gettext/';
# Host address for images
-$photoserver_ip='localhost/care2x_26RC/';
+$photoserver_ip='localhost/gettext/care2002/care2x/branches/gettext/';
# Transfer protocol. Use https if this runs on SSL server
$httprotocol='http';
@@ -33,7 +33,7 @@
$dbtype='mysql';
# Set this to your timezone.
-$timezone = 'Africa/Abidjan';
+$timezone = 'Europe/Tirane';
date_default_timezone_set($timezone);
?>
\ No newline at end of file
Modified: care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
2010-07-21 17:10:13 UTC (rev 6635)
+++ care2x/branches/gettext/include/helpers/inc_passcheck_mask.php
2010-07-22 11:19:22 UTC (rev 6636)
@@ -93,7 +93,7 @@
$smarty->assign('sPassHiddenInputs',$sHiddenTemp);
-$smarty->assign('sPassSubmitButton','<button type="submit"
class="positive"><img '.createComIcon(CARE_GUI
,'accept.png','0').'>'.$LDLogin.'</button>');
+$smarty->assign('sPassSubmitButton','<button type="submit"
class="positive"><img '.createComIcon(CARE_GUI
,'accept.png','0').'>'.$LDLogin.'</button>');
$smarty->assign('sCancelButton','<a href="'.$breakfile.'"
class="negative"><img '.createComIcon(CARE_GUI
,'cross.png','0').'>'.$LDCancel.'</a>');
#
Modified: care2x/branches/gettext/main/login-pc-config.php
===================================================================
--- care2x/branches/gettext/main/login-pc-config.php 2010-07-21 17:10:13 UTC
(rev 6635)
+++ care2x/branches/gettext/main/login-pc-config.php 2010-07-22 11:19:22 UTC
(rev 6636)
@@ -141,10 +141,9 @@
#
# Prepare the submit option buttons
#
-
- $smarty->assign('sSubmitFormButton','<input type="submit"
value="'.$LDSave.'">');
+$smarty->assign('sSubmitFormButton','<button type="submit"
class="positive"><img '.createComIcon(CARE_GUI
,'accept.png','0').'>'.$LDSave.'</button>');
$smarty->assign('sNoChangeButton','<input type="button"
value="'.$LDNoChange.'"
onClick="window.location.href=\'startframe.php'.URL_REDIRECT_APPEND.'\'">');
- $smarty->assign('sCancelButton','<a href="startframe.php'.URL_APPEND.'"><img
'.createLDImgSrc(CARE_BASE ,'close2.gif','0','top').'
alt="'.$LDClose.'"></a>');
+ $smarty->assign('sCancelButton','<a href="startframe.php'.URL_APPEND.'"
class="negative"><img '.createComIcon(CARE_BASE ,'cross.png','0').'
alt="'.$LDClose.'">'.$LDClose.'</a>');
#
# Prepare the hidden inputs
Modified: care2x/branches/gettext/main/logout_confirm.php
===================================================================
--- care2x/branches/gettext/main/logout_confirm.php 2010-07-21 17:10:13 UTC
(rev 6635)
+++ care2x/branches/gettext/main/logout_confirm.php 2010-07-22 11:19:22 UTC
(rev 6636)
@@ -21,12 +21,14 @@
<?php echo $nm.'<br>'; ?>
</FONT>
<form name="okbut" action="logout.php">
- <input type="hidden" name="sid" value="<?php echo $sid
?>" >
- <input type="hidden" name="lang" value="<?php echo
$lang ?>" >
- <input type="hidden" name="logout" value="1" >
- <input type="submit" value=" <?php echo $LDYes ?> " >
-
- <input type="button" value="<?php echo $LDNotReally ?>"
onClick="javascript:window.history.back()">
+ <div class="buttons" style="width:220px;align:center">
+ <input type="hidden" name="sid" value="<?php
echo $sid ?>" >
+ <input type="hidden" name="lang" value="<?php
echo $lang ?>" >
+ <input type="hidden" name="logout" value="1" >
+ <button type="submit" value="<?php echo $LDYes
?>" class="positive"><?php echo $LDYes ?></button>
+
+ <button type="button" class="negative"
value="<?php echo $LDNotReally ?>"
onClick="javascript:window.history.back()"><?php echo $LDNotReally ?></button>
+ </div>
</form>
</center>
</BODY>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
