Revision: 6642
http://care2002.svn.sourceforge.net/care2002/?rev=6642&view=rev
Author: mizuko
Date: 2010-07-26 17:47:26 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
see #65 - ui restyling
Modified Paths:
--------------
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_search_main.tpl
care2x/branches/gettext/include/help/help-info.php
care2x/branches/gettext/include/helpers/inc_patient_searchmask.php
care2x/branches/gettext/language/en/lang_en_aufnahme.php
care2x/branches/gettext/modules/registration_admission/model/class_gui_search_person.php
Modified:
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_search_main.tpl
===================================================================
---
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_search_main.tpl
2010-07-26 16:06:15 UTC (rev 6641)
+++
care2x/branches/gettext/gui/smarty_template/templates/default/registration_admission/reg_search_main.tpl
2010-07-26 17:47:26 UTC (rev 6642)
@@ -17,17 +17,17 @@
<tr>
<td>
<form {{$sFormParams}}>
-
- <br>
- {{$searchprompt}}
- <br>
- {{* Never rename this
input. Redimensioning it is allowed. *}}
- <input type="text"
name="searchkey" size=40 maxlength=80>
- <p>
- {{$sCheckBoxFirstName}}
{{$LDIncludeFirstName}}
-
- {{* Do not move the
sHiddenInputs outside the <form> block *}}
- {{$sHiddenInputs}}
+ <div class="buttons"
style="float: right;">
+ <br>
+
{{$searchprompt}}
+ <br>
+ {{* Never
rename this input. Redimensioning it is allowed. *}}
+ <input
type="text" name="searchkey" size=40 maxlength=80>
+ <br>
+
{{$sFindButton}} <label>{{$sCheckBoxFirstName}}{{$LDIncludeFirstName}}</label>
{{$sCancelButton}}
+ {{* Do not move
the sHiddenInputs outside the <form> block *}}
+
{{$sHiddenInputs}}
+ </div>
</form>
</td>
</tr>
@@ -36,9 +36,6 @@
</td>
</tr>
</table>
-<p>
-{{$sCancelButton}}
-<p>
{{$LDSearchFound}}
Modified: care2x/branches/gettext/include/help/help-info.php
===================================================================
--- care2x/branches/gettext/include/help/help-info.php 2010-07-26 16:06:15 UTC
(rev 6641)
+++ care2x/branches/gettext/include/help/help-info.php 2010-07-26 17:47:26 UTC
(rev 6642)
@@ -41,7 +41,9 @@
?>
<hr>
<ul>
-<a href="javascript:window.parent.close()"><img <?php echo
createLDImgSrc(CARE_GUI ,'closehelp.gif','0') ?> alt="<?php echo
$LDCloseHelpWin ?>"></a>
+<div class="buttons" style="float: right;">
+<a href="javascript:window.parent.close()" class="negative"><img <?php echo
createComIcon(CARE_GUI ,'cross.png','0') ?> alt="<?php echo $LDCloseHelpWin
?>"></a>
+</div>
</ul>
</body>
</html>
Modified: care2x/branches/gettext/include/helpers/inc_patient_searchmask.php
===================================================================
--- care2x/branches/gettext/include/helpers/inc_patient_searchmask.php
2010-07-26 16:06:15 UTC (rev 6641)
+++ care2x/branches/gettext/include/helpers/inc_patient_searchmask.php
2010-07-26 17:47:26 UTC (rev 6642)
@@ -34,7 +34,10 @@
<?php
if(defined('SHOW_FIRSTNAME_CONTROLLER')&&SHOW_FIRSTNAME_CONTROLLER){
?>
- <input type="checkbox" name="firstname_too"
<?php if(isset($firstname_too)&&$firstname_too) echo 'checked'; ?>> <?php echo
$LDIncludeFirstName; ?><p>
+ <label>
+ <?php echo $LDIncludeFirstName; ?>
+ <input type="checkbox"
name="firstname_too" <?php if(isset($firstname_too)&&$firstname_too) echo
'checked'; ?>>
+ </label>
<?php
}
?>
Modified: care2x/branches/gettext/language/en/lang_en_aufnahme.php
===================================================================
--- care2x/branches/gettext/language/en/lang_en_aufnahme.php 2010-07-26
16:06:15 UTC (rev 6641)
+++ care2x/branches/gettext/language/en/lang_en_aufnahme.php 2010-07-26
17:47:26 UTC (rev 6642)
@@ -416,6 +416,8 @@
$LDNoAddress='No City defined yet. Please go to the main menu and click
Special Tools -> Address Manager -> New data and <br>enter City and ZIP data.';
+
+$LDFind='Find';
$LDClose = 'Close';
$LDBack = 'Back';
$LDHelp = 'Help';
Modified:
care2x/branches/gettext/modules/registration_admission/model/class_gui_search_person.php
===================================================================
---
care2x/branches/gettext/modules/registration_admission/model/class_gui_search_person.php
2010-07-26 16:06:15 UTC (rev 6641)
+++
care2x/branches/gettext/modules/registration_admission/model/class_gui_search_person.php
2010-07-26 17:47:26 UTC (rev 6642)
@@ -361,8 +361,8 @@
#
# Prepare the hidden inputs
#
- $this->smarty->assign('sHiddenInputs','<input type="image"
'.createLDImgSrc($root_path,'searchlamp.gif','0','absmiddle').'>
- <input type="hidden" name="sid"
value="'.$sid.'">
+ $this->smarty->assign('sFindButton','<button type="submit">
<img
'.createComIcon($root_path,'find.png','0','absmiddle').'>'.$LDFind.'</button>');
+ $this->smarty->assign('sHiddenInputs','<input type="hidden"
name="sid" value="'.$sid.'">
<input type="hidden" name="lang"
value="'.$lang.'">
<input type="hidden" name="noresize"
value="'.$noresize.'">
<input type="hidden" name="target"
value="'.$target.'">
@@ -373,7 +373,7 @@
<input type="hidden" name="ipath"
value="'.$ipath.'">
<input type="hidden" name="mode"
value="search">');
- $this->smarty->assign('sCancelButton','<a
href="'.$this->cancelfile.URL_APPEND.'"><img
'.createLDImgSrc($root_path,'cancel.gif','0').'></a>');
+ $this->smarty->assign('sCancelButton','<a
href="'.$this->cancelfile.URL_APPEND.'" class="negative"><img
'.createComIcon($root_path,'cross.png','0').'>'.$LDClose.'</a>');
//include($root_path.'include/helpers/inc_patient_searchmask.php');
#
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
Care2002-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
