[Vtigercrm-commits] [vtiger-commits] r10244 - in /vtigercrm/branches/5.0.3: Smarty/templates/EmailDetailView.tpl include/js/prototype.js modules/Users/DetailView.php

Mon Feb 26 10:16:27 EST 2007

Author: saraj
Date: Mon Feb 26 08:16:18 2007
New Revision: 10244

Log:
prototype.js duplication fixed. Fixes #2548

Removed:
    vtigercrm/branches/5.0.3/include/js/prototype.js
Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
    vtigercrm/branches/5.0.3/modules/Users/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl
==============================================================================

--- vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailDetailView.tpl Mon Feb 26 08:16:18 2007
@@ -18,7 +18,7 @@
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
-<script language="javascript" type="text/javascript" src="include/js/prototype.js"></script>
+<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 <table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
 <tbody>

Modified: vtigercrm/branches/5.0.3/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DetailView.php Mon Feb 26 08:16:18 2007
@@ -117,7 +117,7 @@
 {
 	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
 	<div class='selected' id='handle1' style='width: 18px; height: 18px; position: relative; left: 145px;cursor:pointer;'><img src='themes/images/scaler_slider.gif'></div>
-	</div><script language='JavaScript' type='text/javascript' src='include/js/prototype.js'></script>
+	</div><script language='JavaScript' type='text/javascript' src='include/scriptaculous/prototype.js'></script>
 <script language='JavaScript' type='text/javascript' src='include/js/slider.js'></script>
 
 	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>



