[Vtigercrm-commits] [vtiger-commits] r6183 - in /vtigercrm/trunk: Smarty/templates/Buttons_List.tpl Smarty/templates/Buttons_List1.tpl Smarty/templates/Header.tpl Smarty/templates/HomePage.tpl include/js/ajax.js themes/blue/style.css
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 19 09:53:42 EDT 2006
Author: don
Date: Fri May 19 07:53:32 2006
New Revision: 6183
Log:
new clock and calculator has been integrated
Modified:
vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
vtigercrm/trunk/Smarty/templates/Header.tpl
vtigercrm/trunk/Smarty/templates/HomePage.tpl
vtigercrm/trunk/include/js/ajax.js
vtigercrm/trunk/themes/blue/style.css
Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Fri May 19 07:53:32 2006
@@ -44,8 +44,8 @@
<tr>
<td style="padding-right:0px"><a href="#" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock')"></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calc')"></a></a></td>
+ <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
+ <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></a></td>
<td nowrap="nowrap" width="25"> </td>
<td style="padding-right: 0px;"><a href="#" onmouseout="fninvsh('allMenu');" onMouseover="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
</tr>
Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Fri May 19 07:53:32 2006
@@ -57,7 +57,7 @@
<tr>
<td style="padding-right:0px"><a href="#" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock')"></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calc')"></a></a></td>
+ <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></a></td>
<td nowrap="nowrap" width="25"> </td>
<td style="padding-right: 0px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
</tr>
Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Fri May 19 07:53:32 2006
@@ -24,7 +24,9 @@
<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+ <script language="JavaScript" type="text/javascript" src="include/calculator/calc.js"></script>
<script language="JavaScript" type="text/javascript" src="modules/Calendar/script.js"></script>
+ <script language="javascript" type="text/javascript" src="include/scriptaculous/dom-drag.js"></script>
<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class="hdrNameBg">
<tr>
<td><img src="{$IMAGEPATH}/vtiger-crm.gif" alt="vtiger CRM" title="vtiger CRM" border=0></td>
@@ -122,153 +124,38 @@
</tr>
</TABLE>
-<div id="calc" style="position:absolute;width:168px;height:188px;left:100px;top:100px;background-color:#E5E5E5;visibility:hidden;">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td align="right" style="padding:3px;"><a href="#"><img src="{$IMAGEPATH}del.gif" border="0" onclick="fninvsh('calc')" /></a></td>
- </tr>
- <tr><td>{$CALC}</td></tr>
- </table>
-</div>
-
-<div id="wclock">
- <table class="leftFormBorder1" align="center" border="0" cellpadding="2" cellspacing="0" width="100%">
- <tbody>
- <tr><td align="right" style="padding-right:1px;"><a href="#"><img src="{$IMAGEPATH}del.gif" style="border:1px solid #E8F8FF;" onClick="fninvsh('wclock')"></a></td></tr>
- <tr>
- <td nowrap="nowrap"><div style="background-image: url(themes/blue/images/clock_bg.gif); background-repeat: no-repeat; background-position: 4px 38px;" id="theClockLayer">
-<div id="theCities" class="citystyle">
-<form action="" name="frmtimezone">
-<input name="PHPSESSID" value="162c0ab587f6c555aaaa30d681b61f7c" type="hidden">
-<select name="city" size="1" class="detailedViewTextBox" id="city" style="width:125px;" onchange="lcl(this.selectedIndex,this.options[0].selected)">
-<option value="0" selected="selected">Local time</option>
-<option value="4.30">Afghanistan</option>
-<option value="1">Algeria</option>
-<option value="-3">Argentina</option>
-<option value="9.30">Australia - Adelaide</option>
-<option value="8">Australia - Perth</option>
-<option value="10">Australia - Sydney</option>
-<option value="1">Austria</option>
-<option value="3">Bahrain</option>
-<option value="6">Bangladesh</option>
-<option value="1">Belgium</option>
-<option value="-4">Bolivia</option>
-<option value="-5">Brazil - Andes</option>
-<option value="-3">Brazil - East</option>
-<option value="-4">Brazil - West</option>
-<option value="2">Bulgaria</option>
-<option value="6.30">Burma (Myanmar)</option>
-<option value="-5">Chile</option>
-<option value="-7">Canada - Calgary</option>
-<option value="-3.30">Canada - Newfoundland</option>
-<option value="-4">Canada - Nova Scotia</option>
-<option value="-5">Canada - Toronto</option>
-<option value="-8">Canada - Vancouver</option>
-<option value="-6">Canada - Winnipeg</option>
-<option value="8">China - Mainland</option>
-<option value="8">China - Taiwan</option>
-<option value="-5">Colombia</option>
-<option value="-5">Cuba</option>
-<option value="1">Denmark</option>
-<option value="-5">Ecuador</option>
-<option value="2">Egypt</option>
-<option value="12">Fiji</option>
-<option value="2">Finland</option>
-<option value="1">France</option>
-<option value="1">Germany</option>
-<option value="0">Ghana</option>
-<option value="2">Greece</option>
-<option value="-3">Greenland</option>
-<option value="1">Hungary</option>
-<option value="5.30">India</option>
-<option value="8">Indonesia - Bali, Borneo</option>
-<option value="9">Indonesia - Irian Jaya</option>
-<option value="7">Indonesia - Sumatra, Java</option>
-<option value="3.30">Iran</option>
-<option value="3">Iraq</option>
-<option value="2">Israel</option>
-<option value="1">Italy</option>
-<option value="-5">Jamaica</option>
-<option value="9">Japan</option>
-<option value="3">Kenya</option>
-<option value="9">Korea (North & South)</option>
-<option value="3">Kuwait</option>
-<option value="1">Libya</option>
-<option value="8">Malaysia</option>
-<option value="5">Maldives</option>
-<option value="1">Mali</option>
-<option value="4">Mauritius</option>
-<option value="-6">Mexico</option>
-<option value="0">Morocco</option>
-<option value="5.45">Nepal</option>
-<option value="1">Netherlands</option>
-<option value="12">New Zealand</option>
-<option value="1">Nigeria</option>
-<option value="1">Norway</option>
-<option value="4">Oman</option>
-<option value="5">Pakistan</option>
-<option value="-5">Peru</option>
-<option value="8">Philippines</option>
-<option value="1">Poland</option>
-<option value="1">Portugal</option>
-<option value="3">Qatar</option>
-<option value="2">Romania</option>
-<option value="11">Russia - Kamchatka</option>
-<option value="3">Russia - Moscow</option>
-<option value="9">Russia - Vladivostok</option>
-<option value="4">Seychelles</option>
-<option value="3">Saudi Arabia</option>
-<option value="8">Singapore</option>
-<option value="2">South Africa</option>
-<option value="1">Spain</option>
-<option value="3">Syria</option>
-<option value="5.30">Sri Lanka</option>
-<option value="1">Sweden</option>
-<option value="1">Switzerland</option>
-<option value="7">Thailand</option>
-<option value="12">Tonga</option>
-<option value="2">Turkey</option>
-<option value="3">Ukraine</option>
-<option value="5">Uzbekistan</option>
-<option value="7">Vietnam</option>
-<option value="4">UAE</option>
-<option value="0">UK</option>
-<option value="-9">USA - Alaska</option>
-<option value="-9">USA - Arizona</option>
-<option value="-6">USA - Central</option>
-<option value="-5">USA - Eastern</option>
-<option value="-10">USA - Hawaii</option>
-<option value="-5">USA - Indiana East</option>
-<option value="-7">USA - Mountain</option>
-<option value="-8">USA - Pacific</option>
-<option value="3">Yemen</option>
-<option value="1">Yugoslavia</option>
-<option value="2">Zambia</option>
-<option value="2">Zimbabwe</option>
-</select>
-</form>
-</div>
-<script language="javascript" src="include/js/clock.js"></script>
-
-<div id="theFace0" class="facestyle" style="color: rgb(0, 0, 0); top: 81px; left: 96px;">3</div>
-<div id="theFace1" class="facestyle" style="color: rgb(0, 0, 0); top: 102px; left: 90.3731px;">4</div>
-<div id="theFace2" class="facestyle" style="color: rgb(0, 0, 0); top: 117.373px; left: 75px;">5</div>
-<div id="theFace3" class="facestyle" style="color: rgb(0, 0, 0); top: 123px; left: 54px;">6</div>
-<div id="theFace4" class="facestyle" style="color: rgb(0, 0, 0); top: 117.373px; left: 33px;">7</div>
-<div id="theFace5" class="facestyle" style="color: rgb(0, 0, 0); top: 102px; left: 17.6269px;">8</div>
-<div id="theFace6" class="facestyle" style="color: rgb(0, 0, 0); top: 81px; left: 12px;">9</div>
-<div id="theFace7" class="facestyle" style="color: rgb(0, 0, 0); top: 60px; left: 17.6269px;">10</div>
-<div id="theFace8" class="facestyle" style="color: rgb(0, 0, 0); top: 44.6269px; left: 33px;">11</div>
-<div id="theFace9" class="facestyle" style="color: rgb(0, 0, 0); top: 39px; left: 54px;">12</div>
-<div id="theFace10" class="facestyle" style="color: rgb(0, 0, 0); top: 44.6269px; left: 75px;">1</div>
-<div id="theFace11" class="facestyle" style="color: rgb(0, 0, 0); top: 60px; left: 90.3731px;">2</div>
-</div></td>
-</tr>
-</tbody>
-</table>
-</div>
+<div id="calculator_cont" style="position:absolute;"></div>
+ {include file="Clock.tpl"}
+
<div id="qcform" style="position:absolute;width:500px;top:60px;left:450px;z-index:5000;"></div>
<script>
+function fetch_clock()
+{ldelim}
+ var ajaxObj = new Ajax(ajaxClockResponse);
+ var urlstring = "module=Utilities&action=UtilitiesAjax&file=Clock";
+ ajaxObj.process("index.php?",urlstring);
+
+{rdelim}
+function ajaxClockResponse(response)
+{ldelim}
+ document.getElementById("clock_cont").innerHTML=response.responseText;
+ execJS(document.getElementById('clock_cont'));
+{rdelim}
+function fetch_calc()
+{ldelim}
+ var ajaxObj = new Ajax(ajaxCalcResponse);
+ var urlstring = "module=Utilities&action=UtilitiesAjax&file=Calculator";
+ ajaxObj.process("index.php?",urlstring);
+
+{rdelim}
+function ajaxCalcResponse(response)
+{ldelim}
+ document.getElementById("calculator_cont").innerHTML=response.responseText;
+ execJS(document.getElementById('calculator_cont'));
+{rdelim}
+
+
function Announcement_rss()
{ldelim}
var ajaxObj = new Ajax(ajaxRssResponse);
@@ -341,4 +228,6 @@
</tr>
</table>
</div>
+
+
<div id="status" style="display:none;position:absolute;left:970px;top:0px;height:17px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Fri May 19 07:53:32 2006
@@ -60,7 +60,7 @@
<td style="padding-right:0px"><a href="#" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock')"></a></a></td>
- <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calc')"></a></a></td>
+ <td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></a></td>
<td nowrap="nowrap" width="50"> </td>
<td style="padding-right: 0px;"><a href="#" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
Modified: vtigercrm/trunk/include/js/ajax.js
==============================================================================
--- vtigercrm/trunk/include/js/ajax.js (original)
+++ vtigercrm/trunk/include/js/ajax.js Fri May 19 07:53:32 2006
@@ -99,3 +99,30 @@
me.requester.send(parameters);
}
}
+ var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
+ var bOpera = (navigator.userAgent.indexOf('Opera') != -1);
+ var bMoz = (navigator.appName == 'Netscape');
+ function execJS(node) {
+ var st = node.getElementsByTagName('SCRIPT');
+ var strExec;
+ for(var i=0;i<st.length; i++) {
+ if (bSaf) {
+ strExec = st[i].innerHTML;
+ }
+ else if (bOpera) {
+ strExec = st[i].text;
+ }
+ else if (bMoz) {
+ strExec = st[i].textContent;
+ }
+ else {
+ strExec = st[i].text;
+ }
+ try {
+ eval(strExec);
+ } catch(e) {
+ alert(e);
+ }
+ }
+ }
+
Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Fri May 19 07:53:32 2006
@@ -469,7 +469,7 @@
.calAddEvent {
position:absolute;
- z-index:10;
+ z-index:10000;
width:500px;
left:200px;
@@ -1129,11 +1129,9 @@
position:absolute;
left:100px;
top:100px;
- visibility:hidden;
- display:block;
+ display:none;
background-color:#CCCCCC;
width:175px;
- z-index: 11;
}
.leftFormBorder1 {
@@ -1153,32 +1151,31 @@
}
.calcResult {
width: 100%;
- height: 25;
+ height: 25px;
background-color: #FFFFCC;/*CBDFD6*/
border-top: 1px solid #CCC;
border-left: 0px;
border-right: 1px solid #CCC;
border-bottom: 1px solid #CCC;
- font-size: 10;
+ font-size: 10px;
text-align: right;
}
.calcMem {
width: 100%;
- height: 25;
+ height: 25px;
border-top: 1px solid #CCC;
border-left: 1px solid #CCC;
border-right: 0px;
border-bottom: 1px solid #CCC;
background-color: #FFFFCC;/*CBDFD6*/
font-family: Arial;
- font-size: 10;
+ font-size: 10px;
color: #BBB;
text-align: left;
}
.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn {
border: none;
- width: 10;
- height: 20;
+ height: 20px;
font-size: 11px;
color: #FFF;
text-align:left;
@@ -1203,9 +1200,16 @@
width:25px;
/*background-color: #CCC;*/
}
-
-#calc {
- z-index: 11;
+#calc{
+ position:absolute;
+ left:100px;
+ top:100px;
+ background-color:#FFFFFF;
+ width:185px;
+ border-bottom:2px solid #000000;
+ border-right:2px solid #666666;
+ border-left:2px solid #CCCCCC;
+ border-top:2px solid #CCCCCC;
}
/* RSS STYLES */
@@ -1588,7 +1592,7 @@
font-family:Arial, Helvetica, sans-serif;
font-size:11px;
text-decoration:none;
- font-weight:none;
+ font-weight:normal;
padding-left:5px;
height:20px;
border-bottom:1px solid #CCCCCC;
@@ -1627,7 +1631,7 @@
font-family:Arial, Helvetica, sans-serif;
font-size:11px;
text-decoration:none;
- font-weight:none;
+ font-weight:normal;
padding-left:5px;
height:20px;
}
@@ -1767,14 +1771,6 @@
position:relative;
border:1px solid #666666;
height:175px;
- scrollbar-base-color: #9999cc;
- scrollbar-arrow-color: white;
- scrollbar-track-color: #cccccc;
- scrollbar-shadow-color: black;
- scrollbar-lightshadow-color: black;
- scrollbar-darkshadow-color: gray;
- scrollbar-highlight-color: white;
- scrollbar-3dlight-color: black;
}
.txtGreen{
@@ -1959,7 +1955,7 @@
/* All Menu */
#allMenu{
width:500px;
- z-index:12;
+ z-index:10000002;
border-top:2px solid #CCCCCC;
border-left:2px solid #CCCCCC;
border-bottom:2px solid #666666;
@@ -1968,7 +1964,7 @@
top:100px;
background-color:#CCCCCC;
position:absolute;
- z-index:11;
+ z-index:1000001;
display:none;
}
More information about the vtigercrm-commits
mailing list