anchor.diff:  -->
   
   <style>
  -#${n}portletBrowser .dataTables_filter, #${n}portletBrowser .first.paginate_button, #${n}portletBrowser .last.paginate_button{
  -    display: none;
  -}
  -#${n}portletBrowser .dataTables-inline, #${n}portletBrowser .column-filter-widgets {
  -    display: inline-block;
  -}
  -#${n}portletBrowser .dataTables_wrapper {
  -    width: 100%;
  -}
  -#${n}portletBrowser .dataTables_paginate .paginate_button {
  -    margin: 2px;
  -    color: #428BCA;
  -    cursor: pointer;
  -    *cursor: hand;
  -}
  -#${n}portletBrowser .dataTables_paginate .paginate_active {
  -    margin: 2px;
  -    color:#000;
  -}
  -
  -#${n}portletBrowser .dataTables_paginate .paginate_active:hover {
  -    text-decoration: line-through;
  -}
  -
  -#${n}portletBrowser table tr td a {
  -    color: #428BCA;
  -}
  -
  -#${n}portletBrowser .dataTables-left {
  -    float:left;
  -}
  -
  -#${n}portletBrowser .column-filter-widget {
  -    vertical-align: top;
  -    display: inline-block;
  -    overflow: hidden;
  -    margin-right: 5px;
  -}
  -
  -#${n}portletBrowser .filter-term {
  -    display: block;
  -    text-align:bottom;
  -}
  -
  -#${n}portletBrowser .dataTables_length label {
  -    font-weight: normal;
  -}
  -#${n}portletBrowser .datatable-search-view {
  -    text-align:right;
  -}
  +    #${n}portletBrowser .dataTables_filter, #${n}portletBrowser .first.paginate_button, #${n}portletBrowser .last.paginate_button{
  +        display: none;
  +    }
  +
  +    #${n}portletBrowser .dataTables-inline, #${n}portletBrowser .column-filter-widgets {
  +        display: inline-block;
  +    }
  +
  +    #${n}portletBrowser .dataTables_wrapper {
  +        width: 100%;
  +    }
  +
  +    #${n}portletBrowser .pagination {
  +        margin: 0;
  +    }
  +
  +    #${n}portletBrowser .dataTables_info, #${n}portletBrowser .dataTables_length {
  +        margin-top: 7px;
  +    }
  +
  +    #${n}portletBrowser .dataTables_paginate .paginate_button {
  +        margin: 2px;
  +        color: #428bca;
  +        cursor: pointer;
  +        *cursor: hand;
  +    }
  +    #${n}portletBrowser .dataTables_paginate .paginate_active {
  +        margin: 2px;
  +        color: #000;
  +    }
  +
  +    #${n}portletBrowser .dataTables_paginate .paginate_active:hover {
  +        text-decoration: line-through;
  +    }
  +
  +    #${n}portletBrowser table tr td a {
  +        color: #428bca;
  +    }
  +
  +    #${n}portletBrowser .dataTables-left {
  +        float: left;
  +    }
  +
  +    #${n}portletBrowser .dataTables-right {
  +        float: right;
  +    }
  +
  +    #${n}portletBrowser .column-filter-widget {
  +        display: inline;
  +        margin-right: 10px;
  +    }
  +
  +    #${n}portletBrowser .column-filter-widget select {
  +        width: 150px;
  +    }
  +
  +    #${n}portletBrowser .filter-term {
  +        display: block;
  +        text-align: bottom;
  +    }
  +
  +    #${n}portletBrowser .dataTables_length label {
  +        font-weight: normal;
  +    }
  +    #${n}portletBrowser .datatable-search-view {
  +        text-align: right;
  +    }
   </style>
   
   <!-- Portlet -->
   <div id="${n}portletBrowser" class="fl-widget portlet ptl-mgr view-home" role="section">
  +<<<<<<< Updated upstream
   
     <c:if test="${not empty statusMsgCode}">
         <div class="alert alert-success alert-dismissable">
  
positive.code:             <input type="text" class="portlet-search-input"/>
          </form>
        </div>
      </div>
      <div style="clear:both"></div>
    </div>
  
    <!-- Portlet Content -->
    <div class="fl-widget-content content portlet-content" role="main">
        <div>
          <table id="${n}portletsList" class="portlet-table table table-bordered table-hover" style="width:100%;">
            <thead>
              <tr>
                <th><spring:message code="name"/></th>
                <th><spring:message code="type"/></th>
                <th><spring:message code="state"/></th>
                <th><spring:message code="edit"/></th>
                <th><spring:message code="delete"/></th>
                <th><spring:message code="category"/></th>
              </tr>
            </thead>
          </table>
        </div>
    </div> <!-- end: portlet-body -->
  
  </div> <!-- end: portlet -->
  
  <script type="text/javascript">
  
negative.code:                     bVisible: false,
                      asSorting: [ "desc", "asc" ]
                  }  // Categories - hidden 
                  ],
                  fnInitComplete: function (oSettings) {
                      portletList_configuration.main.table.fnDraw();
                  },
                  fnServerData: function (sUrl, aoData, fnCallback, oSettings) {
                      oSettings.jqXHR = $.ajax({
                          url: sUrl,
                          data: aoData,
                          dataType: "json",
                          cache: false,
                          type: oSettings.sServerMethod,
                          success: function (json) {
                              if (json.sError) {
                                  oSettings.oApi._fnLog(oSettings, 0, json.sError);
                              }
  
                              $(oSettings.oInstance).trigger('xhr', [oSettings, json]);
                              fnCallback(json);
                          },
                          error: function (xhr, error, thrown) {
                              lib.handleError(xhr, error, thrown);
                          }
                      });
                  },
                  fnInfoCallback: function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) {
                      var infoMessage = '<spring:message code="datatables.info.message" htmlEscape="false" javaScriptEscape="true"/>';
                      var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
                      infoMessage = infoMessage.replace(/_START_/g, iStart).
                      replace(/_END_/g, iEnd).
                      replace(/_TOTAL_/g, iTotal).
                      replace(/_CURRENT_PAGE_/g, iCurrentPage);
                      return infoMessage;
                  },
              // Add links to the proper columns after we get the data
              fnRowCallback: function (nRow, aData, iDisplayIndex, iDisplayIndexFull) {
                  // Create edit and delete links
  