1. Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon May 18 06:28:19 2009 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

1.1 Files compared

# Location File Last Modified
1 D:\Dolphin-v.6.1.5\admin admin_login.html Mon May 4 03:14:12 2009 UTC
2 D:\Dolphin-v.6.1.6\admin admin_login.html Fri May 8 08:29:08 2009 UTC

1.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 4 100
Changed 3 6
Inserted 0 0
Removed 0 0

1.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are ignored
Line endings Differences in line endings (CR and LF characters) are significant
CR/LF characters Not shown in the comparison detail

1.4 Active regular expressions

No regular expressions were active.

1.5 Comparison detail

1   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Trans itional//E N" "http:/ /www.w3.or g/TR/xhtml 1/DTD/xhtm l1-transit ional.dtd" >   1   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Trans itional//E N" "http:/ /www.w3.or g/TR/xhtml 1/DTD/xhtm l1-transit ional.dtd" >
2   <html xmln s="http:// www.w3.org /1999/xhtm l">   2   <html xmln s="http:// www.w3.org /1999/xhtm l">
3   <head>   3   <head>
4   <meta http -equiv="Co ntent-Type " content= "text/html ; charset= utf-8" />   4   <meta http -equiv="Co ntent-Type " content= "text/html ; charset= utf-8" />
5   <title>__h eader_text __</title>   5   <title>__h eader_text __</title>
6   <link   href="
styles/adm in_login.c ss"   rel="style sheet"   type="text /css"   />
  6   <link   href=" ../admin/ styles/adm in_login.c ss"   rel="style sheet"   type="text /css"   />
7   <script ty pe="text/j avascript"  src="../p lugins/jqu ery/jquery .js"></scr ipt>   7   <script ty pe="text/j avascript"  src="../p lugins/jqu ery/jquery .js"></scr ipt>
8   <script ty pe="text/j avascript" >   8   <script ty pe="text/j avascript" >
9           $( document). ready(func tion() {   9           $( document). ready(func tion() {
10                    var  sMsgText =  '__warnin g_text__';   10                    var  sMsgText =  '__warnin g_text__';
11                    if ( sMsgText.l ength)   11                    if ( sMsgText.l ength)
12                             alert( sMsgText);   12                             alert( sMsgText);
13           }) ;   13           }) ;
14   </script>   14   </script>
15   </head>   15   </head>
16     16  
17   <body>   17   <body>
18     18  
19   <div class ="admin_lo gin_wrappe r">   19   <div class ="admin_lo gin_wrappe r">
20            <img   class="adm in_login_i con"   src="
images/adm in_login_i con.png"   />
  20            <img   class="adm in_login_i con"   src=" ../admin/ images/adm in_login_i con.png"   />
21           <d iv class=" admin_logi n_form_wra pper">   21           <d iv class=" admin_logi n_form_wra pper">
22           <f orm class= "admin_log in_form" a ction="__a ction_url_ _" method= "post">   22           <f orm class= "admin_log in_form" a ction="__a ction_url_ _" method= "post">
23                    <inp ut type="h idden" nam e="relocat e" value=" __relocate _url__" />   23                    <inp ut type="h idden" nam e="relocat e" value=" __relocate _url__" />
24                <table c ellspacing ="20" cell padding="0 " class="a dmin_login _table">   24                <table c ellspacing ="20" cell padding="0 " class="a dmin_login _table">
25                    <tr>   25                    <tr>
26                         <td class= "value">__ name_label __:</td>   26                         <td class= "value">__ name_label __:</td>
27                         <td><input  type="tex t" name="I D" id="adm in_usernam e" /></td>   27                         <td><input  type="tex t" name="I D" id="adm in_usernam e" /></td>
28                    </tr >   28                    </tr >
29                    <tr>   29                    <tr>
30                         <td class= "value">__ password_l abel__:</t d>   30                         <td class= "value">__ password_l abel__:</t d>
31                         <td><input  type="pas sword" nam e="Passwor d" id="adm in_passwor d" /></td>   31                         <td><input  type="pas sword" nam e="Passwor d" id="adm in_passwor d" /></td>
32                    </tr >   32                    </tr >
33                    <tr>   33                    <tr>
34                         <td>&nbsp;   34                         <td>&nbsp;
35                         </td>   35                         </td>
36                         <td><input  type="sub mit" id="a dmin_login _form_subm it" value= "Login"/>< /td>   36                         <td><input  type="sub mit" id="a dmin_login _form_subm it" value= "Login"/>< /td>
37                    </tr >   37                    </tr >
38                </table>   38                </table>
39           </ form>   39           </ form>
40       </div>   40       </div>
41   </div>   41   </div>
42     42  
43   <div class ="admin_lo gin_footer s">   43   <div class ="admin_lo gin_footer s">
44           <d iv class=" left_banne r">   44           <d iv class=" left_banne r">
45            <img   src="image s/admin_lo gin_admin_ logo.png"   alt="Dolph in   7   Admin"   />   45            <img   src="image s/admin_lo gin_admin_ logo.png"   alt="Dolph in   6   Admin"   />
46       </div>   46       </div>
47       <div c lass="righ t_banner">   47       <div c lass="righ t_banner">
48           <i mg src=".. /media/ima ges/small_ logo.png"  alt="BoonE x - Commun ity Softwa re Experts " />   48           <i mg src=".. /media/ima ges/small_ logo.png"  alt="BoonE x - Commun ity Softwa re Experts " />
49       </div>   49       </div>
50   </div>   50   </div>
51     51  
52   </body>   52   </body>
53   </html>   53   </html>