Author: tchemit Date: 2012-01-27 16:50:00 +0100 (Fri, 27 Jan 2012) New Revision: 300 Url: http://forge.codelutin.com/repositories/revision/echobase/300 Log: preparation mise en place theme jquery (echobase-theme) Added: trunk/echobase-ui/src/main/resources/template/themes/ trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/ trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/images/ Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp trunk/echobase-ui/src/main/webapp/css/screen.css trunk/echobase-ui/src/main/webapp/js/gridHelper.js Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp 2012-01-27 15:50:00 UTC (rev 300) @@ -33,4 +33,6 @@ <link rel="icon" type="image/png" href="<s:url value='/images/logo_codelutin.png' />"/> <sj:head jqueryui="true" jquerytheme="start"/> + <%--Use echobase-theme when ready--%> + <%--<sj:head jqueryui="true" jquerytheme="echobase-theme"/>--%> </head> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-27 15:50:00 UTC (rev 300) @@ -68,6 +68,8 @@ $('#editForm').hide(); }); + $.addEvenAndOddClasses('datas'); + // on row selection, let's load the edit form $.addRowSelectTopic('datas', function (event) { @@ -250,7 +252,7 @@ navigatorDelete="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics="datas-rowSelect" - onCompleteTopics="datas-clearSelect" + onCompleteTopics="datas-clearSelect,datas-CompleteTopics" navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"> <sjg:gridColumn name="id" title="id" hidden="true" editable="true"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2012-01-27 15:50:00 UTC (rev 300) @@ -26,6 +26,19 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + $.addEvenAndOddClasses('datas'); + }); + +</script> <s:if test="hasActionErrors()"> <div class="info_error"> <s:actionerror/> @@ -54,6 +67,7 @@ navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" + onCompleteTopics="datas-CompleteTopics" rowNum="10" viewrecords="true"> <s:iterator value="columnNames" var="name" status="status"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-01-27 15:50:00 UTC (rev 300) @@ -39,6 +39,7 @@ console.info("Clear selection = "); $('#modificationTextContainter').html("${emptySelection}"); }); + $.addEvenAndOddClasses('datas'); }); </script> @@ -54,7 +55,7 @@ navigatorDelete="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics='datas-rowSelect' - onCompleteTopics="datas-clearSelect"> + onCompleteTopics="datas-clearSelect,datas-CompleteTopics"> <sjg:gridColumn name="entityType" sortable="true" title="%{getText('echobase.common.entityType')}"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-27 15:50:00 UTC (rev 300) @@ -44,6 +44,7 @@ $.addAddRowTopic('users', '${addUrl}'); $.addSingleRowTopic('users', 'Update', '${updateUrl}', 'user.topiaId'); $.addSingleRowTopic('users', 'Delete', '${delUrl}', 'user.topiaId'); + $.addEvenAndOddClasses('users'); }); </script> @@ -52,7 +53,7 @@ pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' - onCompleteTopics='users-cleanSelect' + onCompleteTopics='users-cleanSelect,users-CompleteTopics' navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" navigatorAdd="false" viewrecords="true" Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-01-27 15:50:00 UTC (rev 300) @@ -25,6 +25,28 @@ font-family: sans-serif; } +/*address this input echobse-theme when ready*/ +.ui-jqgrid-view tr.odd { + background-attachment: scroll; + background-clip: border-box; + background-color: white !important; + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} +.ui-jqgrid-view tr.even{ + background-attachment: scroll; + background-clip: border-box; + background-color: lightgrey !important; + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} + .inline { display:inline; } Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2012-01-27 13:35:03 UTC (rev 299) +++ trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2012-01-27 15:50:00 UTC (rev 300) @@ -21,7 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -( function($) { +( function ($) { $.fn.extend( { @@ -155,6 +155,17 @@ callback(); } }); + }, + + // Ajoute les classes even et odd à tous les tableaux de la page + addEvenAndOddClasses:function (gridId) { + + // On souscrit au topic qui appelle la fonction addEvenAndOddClasses + $.subscribe(gridId + '-CompleteTopics', function () { + $('table tr:even').addClass('even'); + $('table tr:odd').addClass('odd'); + }); + } }); @@ -186,6 +197,9 @@ }, updateSelectBoxContent:function (url, params, jsonTarget, target, callback) { return $(document).updateSelectBoxContent(url, params, jsonTarget, target, callback); + }, + addEvenAndOddClasses:function (gridId) { + return $(document).addEvenAndOddClasses(gridId); } }); })(jQuery);