Changeset 1356


Ignore:
Timestamp:
2009-09-04 08:07:24 (4 years ago)
Author:
sr
Message:

upgradupgrade to jqgrid 3.5.2

Location:
trunk
Files:
81 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/modules/kauri-forms/kauri-forms-jqgrid/src/main/kauri/conf/general.xml

    r1216 r1356  
    22<!-- Set off general parameters --> 
    33<conf> 
    4   <jqgrid version="3.4.3"/> 
     4  <jqgrid version="3.5.2" locale="en"/> 
    55</conf> 

  • trunk/modules/kauri-forms/kauri-forms-jqgrid/src/main/kauri/templates/snippet/headerlinks.xml

    r1261 r1356  
    44 
    55  <t:variable name="version" value="${conf('general','jqgrid/@version')}"/> 
     6  <t:variable name="locale" value="${conf('general','jqgrid/@locale')}"/> 
    67  <t:variable name="uri" value="${publicUri('service:/main/static')}/jqgrid/jqgrid-${version}"/> 
    78 
    8   <!-- To use a non-default jqgrid theme, set a jqGridTheme variable before including the snippet --> 
    9   <t:variable name="jqGridThemeResolved" value="${not empty jqGridTheme ? jqGridTheme : 'basic'}"/> 
    10   <link rel="stylesheet" type="text/css" media="screen" href="${uri}/themes/${jqGridThemeResolved}/grid.css"/> 
    11   <link rel="stylesheet" type="text/css" media="screen" href="${uri}/themes/jqModal.css"/> 
    12  
    13   <t:variable name="jspath" value="${uri}/js/"/> 
    14  
    159  <script type="text/javascript"> 
    16     var pathtojsfiles = "${jspath}"; 
    17     var minver = "${not inSourceMode()}"; 
    18  
    19     var kauri; 
    20     if (!kauri) 
    21       kauri = {}; 
    22     if (!kauri.jqgrid) 
    23       kauri.jqgrid = {}; 
    24  
    25     kauri.jqgrid.imagepath = "${uri}/themes/${jqGridThemeResolved}/images"; 
    26  
    2710    function convertToGrid(jsonIn) { 
    2811        var jsonIn = $.org.kauriproject.JSON.parse(jsonIn); 
    … …  
    4023 
    4124        return jsonOut; 
    42     } 
     25    }   
    4326  </script> 
    44  
    45   <script type="text/javascript" src="${uri}/jquery.jqGrid.js"/> 
    46   <script type="text/javascript" src="${uri}/js/jqModal.js"/> 
    47   <script type="text/javascript" src="${uri}/js/jqDnR.js"/> 
    48  
     27   
     28  <t:import src="headerlinks-${version}.xml" /> 
    4929</t:if> 

  • trunk/samples/kauri-forms-sample/src/main/kauri/pages/grid.html.xml

    r1216 r1356  
    3434              colNames: colHeaders, 
    3535              colModel: colModel, 
    36               imgpath: kauri.jqgrid.imagepath, 
    3736              height: 250, 
    3837 
Note: See TracChangeset for help on using the changeset viewer.