r1240: Working to get a lot of templates fixed for RTL fun

diff --git a/includes/init.php b/includes/init.php
index e190961382fb2239ec170b240ad17ec9c1b08b67..b790cc38d85f8656ab1c7d0125d9be9b08a734fc 100755 (executable)
--- a/includes/init.php
+++ b/includes/init.php
@@ -137,6 +137,8 @@ $language = fetch_user_language();
 $stylevar['lang'] = $language['langcode'];
 $stylevar['lang_dir'] = $language['direction'];
 $stylevar['charset'] = $language['charset'];
+$stylevar['left'] = ($language['direction'] == 'ltr' ? 'left' : 'right');
+$stylevar['right'] = ($language['direction'] == 'ltr' ? 'right' : 'left');
 
 // start gettext engine
 putenv("LANG=$language[langcode]");

diff --git a/templates/editattach.tpl b/templates/editattach.tpl
index 27771077a8f28e02ec4c979ab965ac84c6bc6163..b3689b045226f26fddefb3199cd2a5aa76349bee 100644 (file)
--- a/templates/editattach.tpl
+++ b/templates/editattach.tpl
@@ -16,15 +16,15 @@ $header
 <input name="attachmentid" type="hidden" value="$attachment[attachmentid]" />
 
 <div class="box">
-       <div class="box-head">
+       <div class="box-head" style="text-align: $stylevar[left]">
                <lang 1="$attachment[attachmentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Attachment #%1$s for Bug #%2$s %3$s"}</lang>
        </div>
        
-       <div class="box-mid box-margmod-bottom">
+       <div class="box-mid box-margmod-bottom" style="text-align: $stylevar[left]">
                <div><strong>{@"Attachment"}:</strong> <a href="viewattachment.php?attachmentid=$attachment[attachmentid]">{@"View"}</a> [$attachment[filename]]</div>
        </div>
        
-       <div class="box-mid">
+       <div class="box-mid" style="text-align: $stylevar[left]">
                <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="$attachment[description]" /></div>
                <div><strong>{@"Obsolete"}:</strong> <input name="obsolete" type="checkbox" value="1"<if condition="$attachment['obsolete']"> checked="checked"</if> /></div>
        </div>

diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl
index 8ce31c2c98cd0ba25e92b71acaababb1ca7637eb..7b2e20c30e456dfac43c14597c254f9ae40ee066 100644 (file)
--- a/templates/editcomment.tpl
+++ b/templates/editcomment.tpl
@@ -11,7 +11,7 @@ $headinclude
 $header
 
 <if condition="$show['errors']">
-<div class="error">
+<div class="error" style="text-align: $stylevar[left]">
        {@"The following errors occurred"}:
        {$message->process}
 </div>
@@ -22,13 +22,13 @@ $header
 <input type="hidden" name="commentid" value="$comment[commentid]" />
 
 <div class="box">
-       <div class="box-head">
+       <div class="box-head" style="text-align: $stylevar[left]">
                <lang 1="$comment[commentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Comment #%1$s in bug #%2$s <em>%3$s</em>"}</lang>
        </div>
        
-       <div class="box-foot box-margmod-bottom"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
+       <div class="box-foot box-margmod-bottom" style="text-align: $stylevar[left]"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
        
-       <div class="box-mid">
+       <div class="box-mid" style="text-align: $stylevar[left]">
                <if condition="$show['hide']"><div><strong<if condition="$comment['hidden']"> style="color: red"</if>>{@"Hidden"}:</strong> <input type="checkbox" name="hidden" value="1"<if condition="$comment['hidden']"> checked="checked"</if> /></div></if>
                <textarea name="comment" cols="50" rows="15" style="width: 100%">$comment[comment]</textarea>
        </div>

diff --git a/templates/newattach.tpl b/templates/newattach.tpl
index aa2015c2a388cbe6250eee204f9ae87c14616217..5a200b30d2de10486f13c2704ef0eb961e6a1cd8 100644 (file)
--- a/templates/newattach.tpl
+++ b/templates/newattach.tpl
@@ -11,7 +11,7 @@ $headinclude
 $header
 
 <if condition="$show['errors']">
-<div class="error">
+<div class="error" style="text-align: $stylevar[left]">
        {@"The following errors occurred"}:
        {$message->process}
 </div>
@@ -24,15 +24,15 @@ $header
 <input name="MAX_FILE_SIZE" type="hidden" value="$MAXFILESIZE" />
 
 <div class="box">
-       <div class="box-head"><lang 1="$bug[bugid]" 2="$bug[summary]">{@"New Attachment for Bug #%1$s %2$s"}</lang></div>
+       <div class="box-head" style="text-align: $stylevar[left]"><lang 1="$bug[bugid]" 2="$bug[summary]">{@"New Attachment for Bug #%1$s %2$s"}</lang></div>
        
-       <div class="box-mid box-margmod-bottom">
+       <div class="box-mid box-margmod-bottom" style="text-align: $stylevar[left]">
                <div><input name="attachment" type="file" /></div>
                <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" /></div>
        </div>
        
        <if condition="$show['obsoletes']">
-       <div class="box-mid box-margmod-bottom">
+       <div class="box-mid box-margmod-bottom" style="text-align: $stylevar[left]">
                <div><strong>{@"Mark the Following Attachments Obsolete"}:</strong>
                        $obsoletes
                </div>
@@ -40,7 +40,7 @@ $header
        </if>
        
        <if condition="$show['addcomment']">
-       <div class="box-mid">
+       <div class="box-mid" style="text-align: $stylevar[left]">
                <div><strong>{@"Add Comment"}:</strong>
                        <div>
                                <textarea name="comment" rows="10" cols="50" style="width: 100%">{$bugsys->in['comment']}</textarea>

diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index 12411e609982dfadcd9c1b5dd4d4cf1444a86e19..ae41b4dc6d3b41b11511dee42256bc8c885d4d77 100644 (file)
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -12,7 +12,7 @@ $headinclude
 $header
 
 <if condition="$show['errors']">
-<div class="error">
+<div class="error" style="text-align: $stylevar[left]">
        {@"The following errors occurred"}:
        {$message->process}
 </div>

diff --git a/templates/quicksearch.tpl b/templates/quicksearch.tpl
index a4bbf94ec44a0fede229ae2a44702e736cdae3e3..d9226b5933ad2ca7b237f0f757cd68c1d23ed29c 100644 (file)
--- a/templates/quicksearch.tpl
+++ b/templates/quicksearch.tpl
@@ -12,11 +12,11 @@ $header
 
 <div align="center" style="margin-top: 10px">
        <div class="box" style="width: $stylevar[alternate_width]">
-               <div class="box-head">{@"Quick Search"}</div>
+               <div class="box-head" style="text-align: $stylevar[left]">{@"Quick Search"}</div>
                
-               <div class="box-mid box-overpad">
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
                        <if condition="$error">
-                               <div class="error" style="margin-bottom: 5px">$error</div>
+                               <div class="error" style="margin-bottom: 5px; text-align: $stylevar[left]">$error</div>
                        </if>
                        
                        <form name="quicksearch" action="showreport.php" method="post" class="form">

diff --git a/templates/register.tpl b/templates/register.tpl
index 846612f12f59e581ca54f93d60fa31c6a8254487..58c5a96937b7f03e7e19072d046a7e9fa8997195 100644 (file)
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -11,7 +11,7 @@ $headinclude
 $header
 
 <if condition="$show['errors']">
-<div class="error">
+<div class="error" style="text-align: $stylevar[left]">
        {@"The following errors occurred"}:
        {$message->process}
 </div>

diff --git a/templates/search_results.tpl b/templates/search_results.tpl
index 79d86d6ee13c7611ed7ad45b2b6de9b8773173ef..8a780f691ba5a9ee8ff417a41350d6d7bb65c671 100644 (file)
--- a/templates/search_results.tpl
+++ b/templates/search_results.tpl
@@ -29,7 +29,7 @@ $bugs
 
 <if condition="$show['pagenav']">
 <!-- pagenav -->
-<div align="right">
+<div align="$stylevar[right]">
 $pagenav
 </div>
 <!-- / pagenav -->

diff --git a/templates/showreport_comment.tpl b/templates/showreport_comment.tpl
index 57f24571e95627a2a6d1e47269f11114e373d5a4..ea2de6c4f5077a012581d58f5ab0bedc83dc8286 100644 (file)
--- a/templates/showreport_comment.tpl
+++ b/templates/showreport_comment.tpl
@@ -1,8 +1,8 @@
 
 <!-- comment $comment[commentid] -->
 <div class="box">
-       <div class="box-head">
-               <span style="float: right">$comment[posttime]</span>
+       <div class="box-head" style="text-align: $stylevar[left]">
+               <span style="float: $stylevar[right]">$comment[posttime]</span>
                $comment[postby]
        </div>
        
@@ -11,8 +11,8 @@
        </div>
        
        <if condition="$show['editcomment']">
-       <div class="box-foot">
-               <span style="float: right">
+       <div class="box-foot" style="text-align: $stylevar[left]">
+               <span style="float: $stylevar[right]">
                        <if condition="$show['delete']">[<a href="editcomment.php?do=delete&amp;commentid=$comment[commentid]">{@"Delete"}</a>]</if>
                        [<a href="editcomment.php?commentid=$comment[commentid]">{@"Edit Comment"}</a>]
                </span>

diff --git a/templates/std_error.tpl b/templates/std_error.tpl
index 810843c2b8425ab82c2584d1284d5e32d6455c16..98595cef5fb0c057b5953bc0910cf95e9a2640ce 100644 (file)
--- a/templates/std_error.tpl
+++ b/templates/std_error.tpl
@@ -12,9 +12,9 @@ $header
 
 <div align="center" style="margin-top: 10px">
        <div class="box" style="width: $stylevar[alternate_width]">
-               <div class="box-head">{@"Error"}</div>
+               <div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
                
-               <div class="box-mid box-overpad">
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
                        {$this->process}
                </div>
        </div>

diff --git a/templates/std_message.tpl b/templates/std_message.tpl
index 36e38efa940394d9f805733e29be8fc960ee5b1c..f8d8996a504210b1d1e580c0585d19aabfdb760c 100644 (file)
--- a/templates/std_message.tpl
+++ b/templates/std_message.tpl
@@ -18,9 +18,9 @@ $extra
 
 <div align="center" style="margin-top: 10px">
        <div class="box" style="width: $stylevar[alternate_width]">
-               <div class="box-head"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
+               <div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
                
-               <div class="box-mid box-overpad">
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
                        {$this->process}
                        
                        <if condition="$show['confirm']">

diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl
index 0083da8322240f781537333b5e4b31adbd9a6da5..fd9e227671f0827f77a44419ef523a886aa6e156 100644 (file)
--- a/templates/std_redirect.tpl
+++ b/templates/std_redirect.tpl
@@ -13,9 +13,9 @@ $header
 
 <div align="center" style="margin-top: 10px">
        <div class="box" style="width: $stylevar[alternate_width]">
-               <div class="box-head">{@"Redirect..."}</div>
+               <div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
                
-               <div class="box-mid box-overpad">
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
                        {$this->process}
                        
                        <br />

diff --git a/templates/trackerhome.tpl b/templates/trackerhome.tpl
index 0802aa64b137bd6045274348c8e29b92b425e857..382ef3589e7390bdece6e3bb67cb9bf48e2ee39f 100644 (file)
--- a/templates/trackerhome.tpl
+++ b/templates/trackerhome.tpl
@@ -23,7 +23,7 @@ $bugs
 
 <if condition="$show['pagenav']">
 <!-- pagenav -->
-<div align="right">
+<div align="$stylevar[right]">
 $pagenav
 </div>
 <!-- / pagenav -->

diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index 3424a5b41fd05b7e1bdff8b4b52539bb4fbf8533..95ee97d729fc860e0e521d95e7efe23b775ebf04 100644 (file)
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -15,7 +15,7 @@ $header
 <input type="hidden" name="do" value="update" />
 
 <if condition="$show['errors']">
-<div class="error">
+<div class="error" style="text-align: $stylevar[left]">
        {@"The following errors occurred"}:
        {$message->process}
 </div>
@@ -26,7 +26,7 @@ $header
                <td width="50%">
                        <div class="box">
                                <!-- user options -->
-                               <div class="box-head">{@"User Options"}</div>
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"User Options"}</div>
                                
                                <div class="box-mid">
                                        <fieldset>
@@ -70,7 +70,7 @@ $header
                <!-- password and email -->
                <td>
                        <div class="box">
-                               <div class="box-head">
+                               <div class="box-head" style="text-align: $stylevar[left]">
                                        {@"Please enter your password to change these fields"}:
                                        <br />
                                        
@@ -109,7 +109,7 @@ $header
                <!-- email options -->
                <td>
                        <div class="box">
-                               <div class="box-head">{@"Email Options"}</div>
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
                                
                                <div class="box-mid">
                                        <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
@@ -123,17 +123,17 @@ $header
                                        </tr>
                                        
                                        <tr style="text-align: center; background-color: $stylevar[alt_color]">
-                                               <td style="text-align: left">{@"New bug is added"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"New bug is added"}</td>
                                                <td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
                                        </tr>
                                        
                                        <tr style="text-align: center">
-                                               <td style="text-align: left">{@"I am made the assignee"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"I am made the assignee"}</td>
                                                <td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
                                        </tr>
                                        
                                        <tr style="text-align: center; background-color: $stylevar[alt_color]">
-                                               <td style="text-align: left">{@"Status or resolution changes"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"Status or resolution changes"}</td>
                                                <td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[4][64]"{$checked[4][64]} value="1" /></td>
@@ -142,7 +142,7 @@ $header
                                        </tr>
                                        
                                        <tr style="text-align: center">
-                                               <td style="text-align: left">{@"'Duplicates' field is changed"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"'Duplicates' field is changed"}</td>
                                                <td><input type="checkbox" name="emailopts[1][128]"{$checked[1][128]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[2][128]"{$checked[2][128]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[4][128]"{$checked[4][128]} value="1" /></td>
@@ -151,7 +151,7 @@ $header
                                        </tr>
                                        
                                        <tr style="text-align: center; background-color: $stylevar[alt_color]">
-                                               <td style="text-align: left">{@"A new comment is added"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"A new comment is added"}</td>
                                                <td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[4][256]"{$checked[4][256]} value="1" /></td>
@@ -160,7 +160,7 @@ $header
                                        </tr>
                                        
                                        <tr style="text-align: center">
-                                               <td style="text-align: left">{@"A new attachment is added"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"A new attachment is added"}</td>
                                                <td><input type="checkbox" name="emailopts[1][512]"{$checked[1][512]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[2][512]"{$checked[2][512]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[4][512]"{$checked[4][512]} value="1" /></td>
@@ -169,7 +169,7 @@ $header
                                        </tr>
                                        
                                        <tr style="text-align: center; background-color: $stylevar[alt_color]">
-                                               <td style="text-align: left">{@"Any other field changes"}</td>
+                                               <td style="text-align: $stylevar[left]">{@"Any other field changes"}</td>
                                                <td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
                                                <td><input type="checkbox" name="emailopts[4][1024]"{$checked[4][1024]} value="1" /></td>
@@ -185,7 +185,7 @@ $header
                <!-- display options -->
                <td>
                        <div class="box">
-                               <div class="box-head">{@"Bug List Display Options"}</div>
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"Bug List Display Options"}</div>
                                
                                <div class="box-mid">
                                        <fieldset>