Commits

zaif committed bb60fda Merge
  • Participants
  • Parent commits 5a4f34f, 19335b3
  • Branches 3.1.22

Comments (0)

Files changed (3)

File bizhub/templates/__/main.js

 
 $(document).ready(function() {
     //$('#call').click(tableLoad);
+	
   });
 
+function pendingContract()
+{
+	//alert("OK");
+	$("#pendingContract").tablesorter();
+}
+
+function acceptedContract()
+{
+	//alert("OK");
+	$("#acceptedContract").tablesorter();
+}
+
 function eventCalendarRecoredLoad()
 {
 	eventCalendarTableLoad(1,"","on");
 	//alert(document.getElementById('hddAdvertiserList').value);
 }
 
+
 /*---------------------------- Removes leading whitespaces ----------------------------*/
 function LTrim( value ) {
 	var re = /\s*((\S+\s*)*)/;

File bizhub/templates/handler/contract/accepted.htm

 	            </div>
 	            <div class="contentBody">
 	                
-	                <div>
+	                <div style="border: 1px solid #CCCCCC; height:300px; padding:1px">
 	                    
-	                    <div class="divContractTable">
-	                        <div class="divContractTH">
-	                            <div class="divContractTR">
+	                    <table id="acceptedContract"  class="tablesorter">
+	                        <thead>
+	                            <tr>
 	                                
-	                                $[advertiser()$<div class="divContractPublisherTD">Publisher</div>$advertiser]$
-	                                $[publisher()$<div class="divContractAdvertiserTD">Advertiser</div>$publisher]$
+	                                $[advertiser()$<th style="width:30%">Publisher</th>$advertiser]$
+	                                $[publisher()$<th style="width:30%">Advertiser</th>$publisher]$
 	                                
 	                                
-	                                <div class="divContractStartDateTD">Start Date</div>
-	                                <div class="divContractEndDateTD">End Date</div>
-	                                <div class="divContractAmountTD">Amount</div>
-	                                <div class="divContractActionTD">Action</div>
-	                            </div>
-	                        </div>
+	                                <th style="width:20%">Start Date</th>
+	                                <th style="width:20%">End Date</th>
+	                                <th style="width:10%">Amount</th>
+	                                <th style="width:20%">Action</th>
+	                            </tr>
+	                        </thead>
 	                        $[allPendingContracts con$ $|$
-	                        <div class="divNewTR"></div>
-                            <div class="divContractTR $con.oddEvenRow$">
-                            
-                                $[advertiser()$<div class="divContractPublisherTD">$con.publisherName$</div>$advertiser]$
-                                $[publisher()$<div class="divContractAdvertiserTD">$con.advertiserName$</div>$publisher]$
-                            
-                                <div class="divContractStartDateTD">$con.startDate$</div>
-                                <div class="divContractEndDateTD">$con.endDate$</div>
-                                <div class="divContractAmountTD">$con.amount$</div>
-                                
-                                <div class="divContractActionTD">
-                                    
-                                    <div class="viewIcon" onclick="location.href='$con.viewLink$';" title="View"></div>
-                                    <div class="blankDiv"></div>
-                                    <!--
-                                    <div class="editIcon" onclick="location.href='$con.editLink$';" title="Edit"></div>
-                                    <div class="blankDiv"></div>
-                                    <div class="deleteIcon" onclick="if(confirm('Do you really want to delete?')){location.href='$con.deleteLink$';}else{return false;}" title="Delete"></div>
-                                    <div class="blankDiv"></div>
-                                    -->
-	                                <div class="contractAction">
-		                                <div class="declineButton"><a href='$con.declineLink$'>Decline</a></div>
-	                                </div>
+	                        <tbody>
+	                            <tr>	
+	                                $[advertiser()$<td>$con.publisherName$</td>$advertiser]$
+	                                $[publisher()$<td>$con.advertiserName$</td>$publisher]$
+	                            
+	                                <td>$con.startDate$</td>
+	                                <td>$con.endDate$</td>
+	                                <td>$con.amount$</td>
 	                                
-                                </div>
-                            </div>
+	                                <td align="center">
+	                                	<div style="width:83%">
+		                                    <div class="viewIcon" onclick="location.href='$con.viewLink$';" title="View"></div>
+		                                    <div class="blankDiv"></div>
+		                                    <!--
+		                                    <div class="editIcon" onclick="location.href='$con.editLink$';" title="Edit"></div>
+		                                    <div class="blankDiv"></div>
+		                                    <div class="deleteIcon" onclick="if(confirm('Do you really want to delete?')){location.href='$con.deleteLink$';}else{return false;}" title="Delete"></div>
+		                                    <div class="blankDiv"></div>
+		                                    -->
+			                                <div class="contractAction">
+				                                <div class="declineButton"><a href='$con.declineLink$'>Decline</a></div>
+			                                </div>
+		                                </div>
+	                                </td>
+                                </tr>
+                            </tbody>
                             $allPendingContracts]$
-	                    </div>
+	                    </table>	               
 	                </div>
 	                
 	            </div>
 	        </div>    
 	    </div>
 	</div>
+	<script type="text/javascript">
+		jQuery(document).ready(function(){
+			acceptedContract();            
+	     });
+	</script>
 	
 </body>
 </html>

File bizhub/templates/handler/contract/pending.htm

 	            </div>
 	            <div class="contentBody">
 	                
-	                <div>
+	                <div style="border: 1px solid #CCCCCC; height:300px; padding:1px">
 	                    
-	                    <div class="divContractTable">
-	                        <div class="divContractTH">
-	                            <div class="divContractTR">
+	                    <table id="pendingContract"  class="tablesorter">
+	                        <thead>
+	                            <tr>
 	                                
-	                                $[advertiser()$<div class="divContractPublisherTD">Publisher</div>$advertiser]$
-	                                $[publisher()$<div class="divContractAdvertiserTD">Advertiser</div>$publisher]$
+	                                $[advertiser()$<th style="width:30%">Publisher</th>$advertiser]$
+	                                $[publisher()$<th style="width:30%">Advertiser</th>$publisher]$
 	                                
+	                                <th style="width:20%">Start Date</th>
+	                                <th style="width:20%">End Date</th>
+	                                <th style="width:10%">Amount</th>
+	                                <th style="width:20%">Action</th>
+	                            </tr>
+	                        </thead>
+	                        $[allPendingContracts con$ $|$
+	                        <tbody>
+	                            <tr>	                            
+	                                $[advertiser()$<td>$con.publisherName$</td>$advertiser]$
+	                                $[publisher()$<td>$con.advertiserName$</td>$publisher]$
+	                            
+	                                <td>$con.startDate$</td>
+	                                <td>$con.endDate$</td>
+	                                <td>$con.amount$</td>
 	                                
-	                                <div class="divContractStartDateTD">Start Date</div>
-	                                <div class="divContractEndDateTD">End Date</div>
-	                                <div class="divContractAmountTD">Amount</div>
-	                                <div class="divContractActionTD">Action</div>
-	                            </div>
-	                        </div>
-	                        $[allPendingContracts con$ $|$
-	                        <div class="divNewTR"></div>
-                            <div class="divContractTR $con.oddEvenRow$">
-                            
-                                $[advertiser()$<div class="divContractPublisherTD">$con.publisherName$</div>$advertiser]$
-                                $[publisher()$<div class="divContractAdvertiserTD">$con.advertiserName$</div>$publisher]$
-                            
-                                <div class="divContractStartDateTD">$con.startDate$</div>
-                                <div class="divContractEndDateTD">$con.endDate$</div>
-                                <div class="divContractAmountTD">$con.amount$</div>
-                                
-                                <div class="divContractActionTD">
-                                    $[con.isContractCreatedByMe$
-                                    <div class="viewIcon" onclick="location.href='$con.viewLink$';" title="View"></div>
-                                    <div class="blankDiv"></div>
-                                    <div class="editIcon" onclick="location.href='$con.editLink$';" title="Edit"></div>
-                                    <div class="blankDiv"></div>
-                                    <div class="deleteIcon" onclick="if(confirm('Do you really want to delete?')){location.href='$con.deleteLink$';}else{return false;}" title="Delete"></div>
-                                    <div class="blankDiv"></div>
-                                    $]con.isContractCreatedByMe[$
-                                    <div class="contractAction">
-		                                <div class="acceptButton"><a href='$con.acceptLink$'>Accept</a></div>
-	                                </div>
-	                                <div class="blankDiv"></div>
-	                                <div class="contractAction">
-		                                <div class="declineButton"><a href='$con.declineLink$'>Decline</a></div>
-	                                </div>
-	                                $con.isContractCreatedByMe]$
-                                </div>
-                            </div>
+	                                <td align="center">
+	                                	<div style="width:83%">
+		                                    $[con.isContractCreatedByMe$
+		                                    <div class="viewIcon" onclick="location.href='$con.viewLink$';" title="View"></div>
+		                                    <div class="blankDiv"></div>
+		                                    <div class="editIcon" onclick="location.href='$con.editLink$';" title="Edit"></div>
+		                                    <div class="blankDiv"></div>
+		                                    <div class="deleteIcon" onclick="if(confirm('Do you really want to delete?')){location.href='$con.deleteLink$';}else{return false;}" title="Delete"></div>
+		                                    <div class="blankDiv"></div>
+		                                    $]con.isContractCreatedByMe[$
+		                                    <div class="contractAction">
+				                                <div class="acceptButton"><a href='$con.acceptLink$'>Accept</a></div>
+			                                </div>
+			                                <div class="blankDiv"></div>
+			                                <div class="contractAction">
+				                                <div class="declineButton"><a href='$con.declineLink$'>Decline</a></div>
+			                                </div>
+			                                $con.isContractCreatedByMe]$
+			                                <div style="clear:both"></div>
+		                                </div>
+	                                </td>
+                                </tr>
+                            </tbody>
                             $allPendingContracts]$
-	                    </div>
-	                    
-	                    
-	                </div>
-	                
+	                    </table>	                    
+	                </div>	                
 	            </div>
 	            <div class="contentFooter"></div>
 	        </div>    
 	    </div>
 	</div>
-	
+	<script type="text/javascript">
+		jQuery(document).ready(function(){
+	            pendingContract();            
+	     });
+	</script>
 </body>
 </html>