Skip to content
Snippets Groups Projects

4.1

Merged Michael Fairchild requested to merge 4.1 into master

Please don't merge until we are closer to launch.

Outstanding issues:

  1. Styling of the search input group needs adjustment (button is not aligned correctly)
  2. Testing

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Michael Fairchild Added 4 new commits:

    Added 4 new commits:

    • 84df6ed9 - Load HTMLPurifier with composer
    • 7f4b530f - Add the composer autoload to the sample config
    • 3b524d39 - Remove old pear libraries
    • 6926bc2b - Camel Case
  • Same comment about setting the localIncludePath for the WDN dependencies.

  • Michael Fairchild Added 1 new commit:

    Added 1 new commit:

    • 9ff83745 - Use the shared iim app footer
  • Michael Fairchild Added 1 new commit:

    Added 1 new commit:

  • Kevin Abel Added 1 new commit:

    Added 1 new commit:

    • a03e3597 - Remove/ignore .settings dir
  • Kevin Abel Added 13 new commits:

    Added 13 new commits:

    • 0a1962aa - Remove the rest of the old PEAR directory
    • 4343a457 - Update config and ignore
    • 270732d2 - Update comoser deps and use autoload
    • bed234a8 - Rename README for markdown
    • bb2313dd - Whitespace
    • c805f70f - Convert JS into AMD for loading through requirejs
    • a62c20aa - Use WDN input group markup
    • 4ee199e8 - Ensure that the results placeholder is loaded
    • 38dbb9ce - Break the less into separate modules and remove lesshat
    • f723eff1 - Coding standards and add WDN include path
    • 41215ab6 - Remove Makefile that will be replaced by grunt
    • 246b6cf1 - Move the local script stuff into separate template
    • c12398b3 - Add Gruntfile and NPM package info
  • Kevin Abel Added 7 new commits:

    Added 7 new commits:

    • b4778891 - Add js source needed for minimal embed scripts
    • 544be28b - Add grunt config for building embed scripts
    • e756cc74 - End scripts do not need WDN dependency.
    • 9c54e929 - Fix caret positioning on result tabs
    • a365eeaf - Markup adjustments for better embed experience
    • 98448aca - Redo embed templates to be lighter.
    • 7559ea0b - Ensure analytics actually work
  • Michael Fairchild
  • 69 .addClass('active');
    21 var dirResults = 'ppl_results';
    22 var unlResults = 'unl_results';
    23 var localResults = 'local_results';
    70 24
    71 this._renderState(0);
    72 };
    73 Directory.prototype._renderState = function(duration) {
    74 var $innerRes = $('.results', $(this._renderTo)),
    75 $showRes, failState,
    76 depFilter = '.departments';
    77
    78 if (!$innerRes.length) {
    79 return;
    80 }
    25 window.pf_getUID = function() {
  • Michael Fairchild
  • 80 }
    25 window.pf_getUID = function() {
    26 return true;
    27 };
    81 28
    82 $innerRes.slideUp(duration);
    83 if (this._viewState === 0) {
    84 $showRes = $innerRes.not(depFilter);
    85 failState = 1;
    86 } else {
    87 $showRes = $innerRes.filter(depFilter);
    88 failState = 0;
    89 }
    29 // Caching Class
    30 var Cache = function() {
    31 this.storage = {};
  • Kevin Abel
    Kevin Abel @kabel2 started a thread on commit c805f70f
  • 80 }
    25 window.pf_getUID = function() {
    26 return true;
    27 };
    81 28
    82 $innerRes.slideUp(duration);
    83 if (this._viewState === 0) {
    84 $showRes = $innerRes.not(depFilter);
    85 failState = 1;
    86 } else {
    87 $showRes = $innerRes.filter(depFilter);
    88 failState = 0;
    89 }
    29 // Caching Class
    30 var Cache = function() {
    31 this.storage = {};
  • Kevin Abel
    Kevin Abel @kabel2 started a thread on commit c805f70f
  • 69 .addClass('active');
    21 var dirResults = 'ppl_results';
    22 var unlResults = 'unl_results';
    23 var localResults = 'local_results';
    70 24
    71 this._renderState(0);
    72 };
    73 Directory.prototype._renderState = function(duration) {
    74 var $innerRes = $('.results', $(this._renderTo)),
    75 $showRes, failState,
    76 depFilter = '.departments';
    77
    78 if (!$innerRes.length) {
    79 return;
    80 }
    25 window.pf_getUID = function() {
  • One outstanding issue: the local footer is broken when doing a site search due to https://github.com/unlcms/unl_fourone/issues/4

  • Michael Fairchild Added 4 new commits:

    Added 4 new commits:

    • 3d97e547 - Use local wdn includes if available
    • 06a5d19c - Merge branch '4.1' of git.unl.edu:iim/UNL_Search into 4.1
    • a8a3d4f9 - Update the readme file to reflect new build process
    • f105d894 - Fix footer headings
  • @kabel2 I made some more commits, readme and footer related stuff.

  • Kevin Abel
    Kevin Abel @kabel2 started a thread on commit f105d894
  • 78 87 $scannedContent = UNL_Search::removeRelativePaths($scannedContent, $_GET['u']);
    79 88 break;
    80 89 case 'contactinfo':
    90 //print_r($scannedContent);exit();
  • What's the issue with cms?

  • Michael Fairchild
  • 78 87 $scannedContent = UNL_Search::removeRelativePaths($scannedContent, $_GET['u']);
    79 88 break;
    80 89 case 'contactinfo':
    90 //print_r($scannedContent);exit();
  • Michael Fairchild Added 1 new commit:

    Added 1 new commit:

  • @kabel2 The issue with cms is that leftcollinks is a child of contactinfo, which is wrapped by a gridset for layout. The parser renders these the 'correct' way in search, which removes layout from leftcollinks.

  • @kabel2 Do you think this should be merged?

  • I do.

  • It has already been deployed to the host that will become live this weekend.

  • Please register or sign in to reply
    Loading