diff --git a/.htaccess b/.htaccess old mode 100755 new mode 100644 diff --git a/Login Information.txt b/Login Information.txt index 37f9643..41b1161 100644 --- a/Login Information.txt +++ b/Login Information.txt @@ -1,2 +1,2 @@ user: admin -pass: 9ItfWrmy1f22iZfJr3w8 \ No newline at end of file +pass: 9ItfWrmy1f22iZfJr3w8 diff --git a/sites/all/modules/emfield/LICENSE.txt b/sites/all/modules/emfield/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/emfield/README.txt b/sites/all/modules/emfield/README.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/emfield/emfield.info b/sites/all/modules/emfield/emfield.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/emfield/emfield.install b/sites/all/modules/emfield/emfield.install old mode 100755 new mode 100644 diff --git a/sites/all/modules/emfield/emfield.module b/sites/all/modules/emfield/emfield.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/API.txt b/sites/all/modules/media/API.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/CHANGELOG.txt b/sites/all/modules/media/CHANGELOG.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/LICENSE.txt b/sites/all/modules/media/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/MediaReadOnlyStreamWrapper.inc b/sites/all/modules/media/MediaReadOnlyStreamWrapper.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/README.txt b/sites/all/modules/media/README.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/css/media.css b/sites/all/modules/media/css/media.css old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.admin.inc b/sites/all/modules/media/file_entity/file_entity.admin.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.admin.js b/sites/all/modules/media/file_entity/file_entity.admin.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.api.php b/sites/all/modules/media/file_entity/file_entity.api.php old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.field.inc b/sites/all/modules/media/file_entity/file_entity.field.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.file_api.inc b/sites/all/modules/media/file_entity/file_entity.file_api.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.info b/sites/all/modules/media/file_entity/file_entity.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.install b/sites/all/modules/media/file_entity/file_entity.install old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/file_entity.module b/sites/all/modules/media/file_entity/file_entity.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/tests/file_entity_test.info b/sites/all/modules/media/file_entity/tests/file_entity_test.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/tests/file_entity_test.module b/sites/all/modules/media/file_entity/tests/file_entity_test.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/file_entity/tests/file_entity_test.pages.inc b/sites/all/modules/media/file_entity/tests/file_entity_test.pages.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/display-list-active.png b/sites/all/modules/media/images/display-list-active.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/display-list.png b/sites/all/modules/media/images/display-list.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/display-thumbnails-active.png b/sites/all/modules/media/images/display-thumbnails-active.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/display-thumbnails.png b/sites/all/modules/media/images/display-thumbnails.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/file-unknown.png b/sites/all/modules/media/images/file-unknown.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/application-octet-stream.png b/sites/all/modules/media/images/icons/default/application-octet-stream.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/audio-mpeg.png b/sites/all/modules/media/images/icons/default/audio-mpeg.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/audio-x-generic.png b/sites/all/modules/media/images/icons/default/audio-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/file-unknown.png b/sites/all/modules/media/images/icons/default/file-unknown.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/image-x-generic.png b/sites/all/modules/media/images/icons/default/image-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/default/video-x-generic.png b/sites/all/modules/media/images/icons/default/video-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/application-octet-stream.png b/sites/all/modules/media/images/icons/ricebowl/application-octet-stream.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/application-pdf.png b/sites/all/modules/media/images/icons/ricebowl/application-pdf.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/audio-mpeg.png b/sites/all/modules/media/images/icons/ricebowl/audio-mpeg.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/audio-x-generic.png b/sites/all/modules/media/images/icons/ricebowl/audio-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/image-x-generic.png b/sites/all/modules/media/images/icons/ricebowl/image-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/icons/ricebowl/video-x-generic.png b/sites/all/modules/media/images/icons/ricebowl/video-x-generic.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/loading.gif b/sites/all/modules/media/images/loading.gif old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/types/default.png b/sites/all/modules/media/images/types/default.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/images/wysiwyg-media.gif b/sites/all/modules/media/images/wysiwyg-media.gif old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/MediaReadOnlyStreamWrapper.inc b/sites/all/modules/media/includes/MediaReadOnlyStreamWrapper.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.admin.inc b/sites/all/modules/media/includes/media.admin.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.browser.inc b/sites/all/modules/media/includes/media.browser.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.fields.inc b/sites/all/modules/media/includes/media.fields.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.filter.inc b/sites/all/modules/media/includes/media.filter.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.pages.inc b/sites/all/modules/media/includes/media.pages.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.theme.inc b/sites/all/modules/media/includes/media.theme.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.types.inc b/sites/all/modules/media/includes/media.types.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.variables.inc b/sites/all/modules/media/includes/media.variables.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.views.inc b/sites/all/modules/media/includes/media.views.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/includes/media.xml.inc b/sites/all/modules/media/includes/media.xml.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.admin.js b/sites/all/modules/media/js/media.admin.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.browser.js b/sites/all/modules/media/js/media.browser.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.core.js b/sites/all/modules/media/js/media.core.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.format_form.js b/sites/all/modules/media/js/media.format_form.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.js b/sites/all/modules/media/js/media.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/media.popups.js b/sites/all/modules/media/js/media.popups.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/plugins/media.fromurl.js b/sites/all/modules/media/js/plugins/media.fromurl.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/plugins/media.library.css b/sites/all/modules/media/js/plugins/media.library.css old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/plugins/media.library.js b/sites/all/modules/media/js/plugins/media.library.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/plugins/media.upload.js b/sites/all/modules/media/js/plugins/media.upload.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/plugins/media.upload_multiple.js b/sites/all/modules/media/js/plugins/media.upload_multiple.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/util/ba-debug.min.js b/sites/all/modules/media/js/util/ba-debug.min.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/util/json2.js b/sites/all/modules/media/js/util/json2.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/js/wysiwyg-media.js b/sites/all/modules/media/js/wysiwyg-media.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/media.api.php b/sites/all/modules/media/media.api.php old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/media.info b/sites/all/modules/media/media.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/media.install b/sites/all/modules/media/media.install old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/media.media.inc b/sites/all/modules/media/media.media.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/media.module b/sites/all/modules/media/media.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/modules/media_internet/media_internet.api.php b/sites/all/modules/media/modules/media_internet/media_internet.api.php old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/modules/media_internet/media_internet.info b/sites/all/modules/media/modules/media_internet/media_internet.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/modules/media_internet/media_internet.media.inc b/sites/all/modules/media/modules/media_internet/media_internet.media.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/modules/media_internet/media_internet.module b/sites/all/modules/media/modules/media_internet/media_internet.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/templates/media-dialog-page.tpl.php b/sites/all/modules/media/templates/media-dialog-page.tpl.php old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/test/media.entity.test b/sites/all/modules/media/test/media.entity.test old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/test/media.types.test b/sites/all/modules/media/test/media.types.test old mode 100755 new mode 100644 diff --git a/sites/all/modules/media/wysiwyg_plugins/media.inc b/sites/all/modules/media/wysiwyg_plugins/media.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/CHANGELOG.txt b/sites/all/modules/media_youtube/CHANGELOG.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/LICENSE.txt b/sites/all/modules/media_youtube/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/MediaYouTubeStreamWrapper.inc b/sites/all/modules/media_youtube/MediaYouTubeStreamWrapper.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/README.txt b/sites/all/modules/media_youtube/README.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/css/media_youtube.css b/sites/all/modules/media_youtube/css/media_youtube.css old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/css/media_youtube.wysiwyg.css b/sites/all/modules/media_youtube/css/media_youtube.wysiwyg.css old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/images/stream-youtube.png b/sites/all/modules/media_youtube/images/stream-youtube.png old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/MediaInternetYouTubeHandler.inc b/sites/all/modules/media_youtube/includes/MediaInternetYouTubeHandler.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/MediaYouTubeStreamWrapper.inc b/sites/all/modules/media_youtube/includes/MediaYouTubeStreamWrapper.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/MediaYouTubeStyles.inc b/sites/all/modules/media_youtube/includes/MediaYouTubeStyles.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/media_youtube.formatters.inc b/sites/all/modules/media_youtube/includes/media_youtube.formatters.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/media_youtube.styles.inc b/sites/all/modules/media_youtube/includes/media_youtube.styles.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/media_youtube.variables.inc b/sites/all/modules/media_youtube/includes/media_youtube.variables.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/themes/media-youtube-video.tpl.php b/sites/all/modules/media_youtube/includes/themes/media-youtube-video.tpl.php old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/includes/themes/media_youtube.theme.inc b/sites/all/modules/media_youtube/includes/themes/media_youtube.theme.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/js/flash_detect_min.js b/sites/all/modules/media_youtube/js/flash_detect_min.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/js/media_youtube.fromurl.js b/sites/all/modules/media_youtube/js/media_youtube.fromurl.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/js/media_youtube.js b/sites/all/modules/media_youtube/js/media_youtube.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/media_youtube.info b/sites/all/modules/media_youtube/media_youtube.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/media_youtube.install b/sites/all/modules/media_youtube/media_youtube.install old mode 100755 new mode 100644 diff --git a/sites/all/modules/media_youtube/media_youtube.module b/sites/all/modules/media_youtube/media_youtube.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/transliteration/CHANGELOG.txt b/sites/all/modules/transliteration/CHANGELOG.txt index bc32aa4..1a9564c 100644 --- a/sites/all/modules/transliteration/CHANGELOG.txt +++ b/sites/all/modules/transliteration/CHANGELOG.txt @@ -1,4 +1,9 @@ +Transliteration 7.x-3.x, xxxx-xx-xx +----------------------------------- +#1058064 by msti, smk-ka and amateescu: Transliterate search string and index. + + Transliteration 7.x-3.0, 2011-10-14 ----------------------------------- #881644 by amateescu: Added support for the Redirect module to redirect from old filenames. diff --git a/sites/all/modules/transliteration/README.txt b/sites/all/modules/transliteration/README.txt index 8a8a652..ff275dc 100644 --- a/sites/all/modules/transliteration/README.txt +++ b/sites/all/modules/transliteration/README.txt @@ -1,5 +1,4 @@ -/* $Id$ */ - + -- SUMMARY -- Provides a central transliteration service to other Drupal modules, and @@ -105,8 +104,22 @@ Authors: * Stefan M. Kudwien (smk-ka) - http://drupal.org/user/48898 * Daniel F. Kudwien (sun) - http://drupal.org/user/54136 +Maintainers: +* Andrei Mateescu (amateescu) - http://drupal.org/user/729614 + UTF-8 normalization is based on UtfNormal.php from MediaWiki (http://www.mediawiki.org) and transliteration uses data from Sean M. Burke's Text::Unidecode CPAN module (http://search.cpan.org/~sburke/Text-Unidecode-0.04/lib/Text/Unidecode.pm). + +-- USEFUL RESOURCES -- + +Unicode Code Converter: +http://people.w3.org/rishida/tools/conversion/ + +UTF-8 encoding table and Unicode characters: +http://www.utf8-chartable.de/unicode-utf8-table.pl + +Country codes: +http://www.loc.gov/standards/iso639-2/php/code_list.php diff --git a/sites/all/modules/transliteration/data/x03.php b/sites/all/modules/transliteration/data/x03.php index 855c098..2667fa1 100644 --- a/sites/all/modules/transliteration/data/x03.php +++ b/sites/all/modules/transliteration/data/x03.php @@ -10,9 +10,9 @@ 0x60 => '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0x70 => NULL, NULL, NULL, NULL, '\'', ',', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, '?', NULL, 0x80 => NULL, NULL, NULL, NULL, '', '', 'A', ';', 'E', 'I', 'I', NULL, 'O', NULL, 'U', 'O', - 0x90 => 'I', 'A', 'B', 'G', 'D', 'E', 'Z', 'I', 'Th', 'I', 'K', 'L', 'M', 'N', 'X', 'O', + 0x90 => 'I', 'A', 'V', 'G', 'D', 'E', 'Z', 'I', 'Th', 'I', 'K', 'L', 'M', 'N', 'X', 'O', 0xA0 => 'P', 'R', NULL, 'S', 'T', 'Y', 'F', 'H', 'Ps', 'O', 'I', 'Y', 'a', 'e', 'i', 'i', - 0xB0 => 'y', 'a', 'b', 'g', 'd', 'e', 'z', 'i', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o', + 0xB0 => 'y', 'a', 'v', 'g', 'd', 'e', 'z', 'i', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o', 0xC0 => 'p', 'r', 's', 's', 't', 'y', 'f', 'h', 'ps', 'o', 'i', 'y', 'o', 'y', 'o', NULL, 0xD0 => 'b', 'th', 'U', 'U', 'U', 'ph', 'p', '&', NULL, NULL, 'St', 'st', 'W', 'w', 'Q', 'q', 0xE0 => 'Sp', 'sp', 'Sh', 'sh', 'F', 'f', 'Kh', 'kh', 'H', 'h', 'G', 'g', 'CH', 'ch', 'Ti', 'ti', diff --git a/sites/all/modules/transliteration/data/x14.php b/sites/all/modules/transliteration/data/x14.php index b1a1d66..11b3ba6 100644 --- a/sites/all/modules/transliteration/data/x14.php +++ b/sites/all/modules/transliteration/data/x14.php @@ -1,20 +1,20 @@ NULL, 'e', 'aai', 'i', 'ii', 'o', 'oo', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi', + 0x00 => NULL, 'ai', 'aai', 'i', 'ii', 'u', 'uu', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi', 0x10 => 'wii', 'wii', 'wo', 'wo', 'woo', 'woo', 'woo', 'wa', 'wa', 'waa', 'waa', 'waa', 'ai', 'w', '\'', 't', - 0x20 => 'k', 'sh', 's', 'n', 'w', 'n', NULL, 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pe', - 0x30 => 'paai', 'pi', 'pii', 'po', 'poo', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii', - 0x40 => 'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'te', 'taai', 'ti', 'tii', - 0x50 => 'to', 'too', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo', - 0x60 => 'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'ke', 'kaai', 'ki', 'kii', 'ko', - 0x70 => 'koo', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa', - 0x80 => 'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'ce', 'caai', 'ci', 'cii', 'co', 'coo', 'coo', - 0x90 => 'ca', 'caa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa', - 0xA0 => 'cwaa', 'c', 'th', 'me', 'maai', 'mi', 'mii', 'mo', 'moo', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi', + 0x20 => 'k', 'sh', 's', 'n', 'w', 'n', NULL, 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pai', + 0x30 => 'paai', 'pi', 'pii', 'pu', 'puu', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii', + 0x40 => 'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'tai', 'taai', 'ti', 'tii', + 0x50 => 'tu', 'tuu', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo', + 0x60 => 'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'kai', 'kaai', 'ki', 'kii', 'ku', + 0x70 => 'kuu', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa', + 0x80 => 'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'gai', 'caai', 'gi', 'gii', 'gu', 'guu', 'coo', + 0x90 => 'ga', 'gaa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa', + 0xA0 => 'cwaa', 'g', 'th', 'mai', 'maai', 'mi', 'mii', 'mu', 'muu', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi', 0xB0 => 'mwii', 'mwii', 'mwo', 'mwo', 'mwoo', 'mwoo', 'mwa', 'mwa', 'mwaa', 'mwaa', 'mwaa', 'm', 'm', 'mh', 'm', 'm', - 0xC0 => 'ne', 'naai', 'ni', 'nii', 'no', 'noo', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa', - 0xD0 => 'n', 'ng', 'nh', 'le', 'laai', 'li', 'lii', 'lo', 'loo', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi', - 0xE0 => 'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'se', 'saai', 'si', - 0xF0 => 'sii', 'so', 'soo', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo', + 0xC0 => 'nai', 'naai', 'ni', 'nii', 'nu', 'nuu', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa', + 0xD0 => 'n', 'ng', 'nh', 'lai', 'laai', 'li', 'lii', 'lu', 'luu', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi', + 0xE0 => 'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'sai', 'saai', 'si', + 0xF0 => 'sii', 'su', 'suu', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo', ); diff --git a/sites/all/modules/transliteration/data/x15.php b/sites/all/modules/transliteration/data/x15.php index 1b55745..f365b0e 100644 --- a/sites/all/modules/transliteration/data/x15.php +++ b/sites/all/modules/transliteration/data/x15.php @@ -3,14 +3,14 @@ $base = array( 0x00 => 'swa', 'swa', 'swaa', 'swaa', 'swaa', 's', 's', 'sw', 's', 'sk', 'skw', 'sW', 'spwa', 'stwa', 'skwa', 'scwa', 0x10 => 'she', 'shi', 'shii', 'sho', 'shoo', 'sha', 'shaa', 'shwe', 'shwe', 'shwi', 'shwi', 'shwii', 'shwii', 'shwo', 'shwo', 'shwoo', - 0x20 => 'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'ye', 'yaai', 'yi', 'yii', 'yo', 'yoo', 'yoo', 'ya', 'yaa', 'ywe', - 0x30 => 'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'y', 'y', - 0x40 => 'y', 'yi', 're', 're', 'le', 'raai', 'ri', 'rii', 'ro', 'roo', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa', - 0x50 => 'r', 'r', 'r', 'fe', 'faai', 'fi', 'fii', 'fo', 'foo', 'fa', 'faa', 'fwaa', 'fwaa', 'f', 'the', 'the', + 0x20 => 'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'jai', 'yaai', 'ji', 'jii', 'ju', 'juu', 'yoo', 'ja', 'jaa', 'ywe', + 0x30 => 'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'j', 'y', + 0x40 => 'y', 'yi', 're', 'rai', 'le', 'raai', 'ri', 'rii', 'ru', 'ruu', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa', + 0x50 => 'r', 'r', 'r', 'vai', 'faai', 'vi', 'vii', 'vu', 'vuu', 'va', 'vaa', 'fwaa', 'fwaa', 'v', 'the', 'the', 0x60 => 'thi', 'thi', 'thii', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'thwaa', 'thwaa', 'th', 'tthe', 'tthi', 'ttho', 'ttha', 'tth', 0x70 => 'tye', 'tyi', 'tyo', 'tya', 'he', 'hi', 'hii', 'ho', 'hoo', 'ha', 'haa', 'h', 'h', 'hk', 'qaai', 'qi', - 0x80 => 'qii', 'qo', 'qoo', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi', - 0x90 => 'ngii', 'ngo', 'ngoo', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th', + 0x80 => 'qii', 'qu', 'quu', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi', + 0x90 => 'ngii', 'ngu', 'nguu', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th', 0xA0 => 'lhi', 'lhii', 'lho', 'lhoo', 'lha', 'lhaa', 'lh', 'the', 'thi', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'th', 'b', 0xB0 => 'e', 'i', 'o', 'a', 'we', 'wi', 'wo', 'wa', 'ne', 'ni', 'no', 'na', 'ke', 'ki', 'ko', 'ka', 0xC0 => 'he', 'hi', 'ho', 'ha', 'ghu', 'gho', 'ghe', 'ghee', 'ghi', 'gha', 'ru', 'ro', 're', 'ree', 'ri', 'ra', diff --git a/sites/all/modules/transliteration/data/x4e.php b/sites/all/modules/transliteration/data/x4e.php index 3ad92e5..b5aa8e8 100644 --- a/sites/all/modules/transliteration/data/x4e.php +++ b/sites/all/modules/transliteration/data/x4e.php @@ -1,7 +1,7 @@ NULL, 'Ding ', 'Kao ', 'Qi ', 'Shang ', 'Xia ', NULL, 'Mo ', 'Zhang ', 'San ', 'Shang ', 'Xia ', 'Ji ', 'Bu ', 'Yu ', 'Mian ', + 0x00 => 'Yi ', 'Ding ', 'Kao ', 'Qi ', 'Shang ', 'Xia ', NULL, 'Mo ', 'Zhang ', 'San ', 'Shang ', 'Xia ', 'Ji ', 'Bu ', 'Yu ', 'Mian ', 0x10 => 'Gai ', 'Chou ', 'Chou ', 'Zhuan ', 'Qie ', 'Pi ', 'Shi ', 'Shi ', 'Qiu ', 'Bing ', 'Ye ', 'Cong ', 'Dong ', 'Si ', 'Cheng ', 'Diu ', 0x20 => 'Qiu ', 'Liang ', 'Diu ', 'You ', 'Liang ', 'Yan ', 'Bing ', 'Sang ', 'Gun ', 'Jiu ', 'Ge ', 'Ya ', 'Qiang ', 'Zhong ', 'Ji ', 'Jie ', 0x30 => 'Feng ', 'Guan ', 'Chuan ', 'Chan ', 'Lin ', 'Zhuo ', 'Zhu ', 'Ha ', 'Wan ', 'Dan ', 'Wei ', 'Zhu ', 'Jing ', 'Li ', 'Ju ', 'Pie ', diff --git a/sites/all/modules/transliteration/transliteration.admin.inc b/sites/all/modules/transliteration/transliteration.admin.inc index 9ffb713..a355eac 100644 --- a/sites/all/modules/transliteration/transliteration.admin.inc +++ b/sites/all/modules/transliteration/transliteration.admin.inc @@ -62,17 +62,22 @@ function transliteration_retroactive_submit($form, &$form_state) { while ($file = $result->fetchObject()) { $wrapper = file_stream_wrapper_get_instance_by_uri($file->uri); + $scheme = file_uri_scheme($file->uri); + + // Missing implementation. if (!$wrapper) { - // Missing implementation. $errors[] = file_uri_target($file->uri); continue; } - if (!in_array('DrupalLocalStreamWrapper', class_parents($wrapper))) { - // Skip non-local files. + + // Skip non-writable stream wrappers. + $writeable_stream_wrappers = file_get_stream_wrappers(STREAM_WRAPPERS_WRITE); + if (!isset($writeable_stream_wrappers[$scheme])) { continue; } + + // Missing file. if (!file_exists($wrapper->realpath())) { - // Missing file. $errors[] = file_uri_target($file->uri); continue; } @@ -133,6 +138,9 @@ function transliteration_file_query() { case 'mysql': case 'mysqli': $operator = 'NOT REGEXP'; + if (variable_get('transliteration_file_lowercase', TRUE)) { + $operator .= ' BINARY'; + } $regex = '/[a-z0-9_.-]+$'; break; diff --git a/sites/all/modules/transliteration/transliteration.info b/sites/all/modules/transliteration/transliteration.info index 948c110..2ba0676 100644 --- a/sites/all/modules/transliteration/transliteration.info +++ b/sites/all/modules/transliteration/transliteration.info @@ -1,10 +1,11 @@ name = Transliteration description = Converts non-latin text to US-ASCII and sanitizes file names. core = 7.x +configure = admin/config/media/file-system -; Information added by drupal.org packaging script on 2011-10-14 -version = "7.x-3.0" +; Information added by drupal.org packaging script on 2012-06-01 +version = "7.x-3.1" core = "7.x" project = "transliteration" -datestamp = "1318580199" +datestamp = "1338540713" diff --git a/sites/all/modules/transliteration/transliteration.install b/sites/all/modules/transliteration/transliteration.install index 0071033..09ccdb4 100644 --- a/sites/all/modules/transliteration/transliteration.install +++ b/sites/all/modules/transliteration/transliteration.install @@ -29,4 +29,5 @@ function transliteration_install() { function transliteration_uninstall() { variable_del('transliteration_file_uploads'); variable_del('transliteration_file_lowercase'); + variable_del('transliteration_search'); } diff --git a/sites/all/modules/transliteration/transliteration.module b/sites/all/modules/transliteration/transliteration.module index 4742bbf..fa185dc 100644 --- a/sites/all/modules/transliteration/transliteration.module +++ b/sites/all/modules/transliteration/transliteration.module @@ -27,6 +27,23 @@ function transliteration_menu() { 'weight' => 10, 'type' => MENU_LOCAL_TASK, ); + $items['admin/config/media/file-system/transliteration'] = array( + 'title' => 'Transliteration', + 'description' => 'Convert existing file names to US-ASCII.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('transliteration_retroactive'), + 'access arguments' => array('administer site configuration'), + 'file' => 'transliteration.admin.inc', + 'weight' => 10, + 'type' => MENU_LOCAL_TASK, + ); + $items['translit/user'] = array( + 'title' => 'Translit user callback', + 'page callback' => 'translit_user', + 'page arguments' => array(2), + 'access arguments' => array('access content'), + 'type' => MENU_CALLBACK, + ); return $items; } @@ -56,6 +73,24 @@ function transliteration_form_system_file_system_settings_alter(&$form, &$form_s $form['buttons']['#weight'] = 1; } +/** + * Implements hook_form_FORM_ID_alter(). + * + * Adds transliteration settings to the search settings form. + */ +function transliteration_form_search_admin_settings_alter(&$form, &$form_state) { + $form['transliteration'] = array( + '#type' => 'fieldset', + '#title' => t('Transliteration'), + ); + $form['transliteration']['transliteration_search'] = array( + '#type' => 'checkbox', + '#title' => t('Transliterate search index and searched strings.'), + '#description' => t('Enable to allow searching and indexing using US-ASCII character set, i.e. to treat accented and unaccented letters the same.'), + '#default_value' => variable_get('transliteration_search', TRUE), + ); +} + /** * Transliterates and sanitizes a file name. * @@ -89,6 +124,8 @@ function transliteration_clean_filename($filename, $source_langcode = NULL) { $filename = str_replace(' ', '_', $filename); // Remove remaining unsafe characters. $filename = preg_replace('![^0-9A-Za-z_.-]!', '', $filename); + // Remove multiple consecutive non-alphabetical characters. + $filename = preg_replace('/(_)_+|(\.)\.+|(-)-+/', '\\1\\2\\3', $filename); // Force lowercase to prevent issues on case-insensitive file systems. if (variable_get('transliteration_file_lowercase', TRUE)) { $filename = strtolower($filename); @@ -149,3 +186,77 @@ function transliteration_init() { } } } + +/** + * Implements hook_search_preprocess(). + * + * Transliterates text added to the search index and user submitted search + * keywords. + */ +function transliteration_search_preprocess($text) { + if (variable_get('transliteration_search', TRUE)) { + return transliteration_get($text, '', language_default('language')); + } + return $text; +} + +/** + * Implements hook_filter_info(). + */ +function transliteration_filter_info() { + return array( + 'transliteration' => array( + 'title' => t('Convert all characters to US-ASCII'), + 'process callback' => '_transliteration_filter_process', + 'settings callback' => '_transliteration_filter_settings', + 'default settings' => array( + 'no_known_transliteration' => '?' + ), + 'tips callback' => '_transliteration_filter_tips', + ), + ); +} + +/** + * Process callback for the transliteration filter. + */ +function _transliteration_filter_process($text, $filter, $format, $langcode, $cache, $cache_id) { + return transliteration_get($text, $filter->settings['no_known_transliteration'], $langcode); +} + +/** + * Settings callback for the transliteration filter. + */ +function _transliteration_filter_settings($form, &$form_state, $filter, $format, $defaults, $filters) { + $filter->settings += $defaults; + + return array( + 'no_known_transliteration' => array( + '#type' => 'textfield', + '#title' => t('Placeholder for characters with no known US-ASCII equivalent'), + '#size' => 2, + // The maximum length is 5 in order to accommodate unicode multibyte input. + '#maxlength' => 5, + '#default_value' => $filter->settings['no_known_transliteration'], + ) + ); +} + +/** + * Filter tips callback for the transliteration filter. + */ +function _transliteration_filter_tips($filter, $format, $long) { + return t('Non-latin text (e.g., å, ö, 漢) will be converted to US-ASCII equivalents (a, o, ?).'); +} + +/** + * Filter tips callback for the transliteration user. + */ +function translit_user($arg = NULL) { + if($arg == 'non-latin') { + global $user; + $user = user_load(1); + return t('non-latin flag is true'); + } + return t('non-latin flag is false'); +} diff --git a/sites/all/modules/views_php/LICENSE.txt b/sites/all/modules/views_php/LICENSE.txt old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_handler_area.inc b/sites/all/modules/views_php/plugins/views/views_php_handler_area.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_handler_field.inc b/sites/all/modules/views_php/plugins/views/views_php_handler_field.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_handler_filter.inc b/sites/all/modules/views_php/plugins/views/views_php_handler_filter.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_handler_sort.inc b/sites/all/modules/views_php/plugins/views/views_php_handler_sort.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_plugin_access.inc b/sites/all/modules/views_php/plugins/views/views_php_plugin_access.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_plugin_cache.inc b/sites/all/modules/views_php/plugins/views/views_php_plugin_cache.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_plugin_pager.inc b/sites/all/modules/views_php/plugins/views/views_php_plugin_pager.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_plugin_query.inc b/sites/all/modules/views_php/plugins/views/views_php_plugin_query.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/plugins/views/views_php_plugin_wrapper.inc b/sites/all/modules/views_php/plugins/views/views_php_plugin_wrapper.inc old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/views_php.info b/sites/all/modules/views_php/views_php.info old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/views_php.js b/sites/all/modules/views_php/views_php.js old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/views_php.module b/sites/all/modules/views_php/views_php.module old mode 100755 new mode 100644 diff --git a/sites/all/modules/views_php/views_php.views.inc b/sites/all/modules/views_php/views_php.views.inc old mode 100755 new mode 100644 diff --git a/sites/all/themes/merritt/css/style.css b/sites/all/themes/merritt/css/style.css index c5dd84c..b78410c 100644 --- a/sites/all/themes/merritt/css/style.css +++ b/sites/all/themes/merritt/css/style.css @@ -86,7 +86,7 @@ div#site-wrapper { text-align: left; background: transparent; color: #666; - font-size: 12px; + font-size: 100%; line-height: 20px; } @@ -100,7 +100,7 @@ header { padding-top: 8px; } header .header-wrapper, header #site-header-left{ - height: 116px; + height: 108px; } header .header-wrapper, #pri-nav-cont{ width: 960px; @@ -108,24 +108,32 @@ header { } header .header-menu-wrapper{ background: url(../gfx/menu-bg.png) 0 0 repeat; + font-size: 12px; + -webkit-box-shadow: 0 0 10px #000; + box-shadow: 0 0 10px #000; + filter: progid:DXImageTransform.Microsoft.dropshadow(offX=0, offY=0, color=#000000); + position: relative; } header #site-header-left { - margin-left: 35px; width: 295px; float: left; + position: relative; + z-index: 1; } #site-logo { margin: 0; padding: 0; } header #site-header-right { - padding-left: 60px; - width: 570px; + width: 650px; float: right; } /* * Header Navigation */ +.header-menu{ + height: 50px; +} #block-menu-menu-header-menu ul{ - margin: 0 0 24px; - padding-bottom: 10px; + margin: 2px 0 24px; + padding-bottom: 11px; background: url(../gfx/header-border-bottom.png) 0 100% repeat-x; float: right; } @@ -154,6 +162,115 @@ header { #block-menu-menu-header-menu ul li.leaf a.active{ color: #fff; } + +/* +* +* HEADER WIDGETS +* +*/ +.header-widgets{ + text-align: right; +} +.region-header-widgets{ + display: inline-block; +} +.region-header-widgets:after{ + content: ''; + clear: both; +} +.region-header-widgets>div{ + width: 132px; + height: 32px; + line-height: 32px; + font-size: 18px; + color: #a99777; + margin: 0 16px 0 0; + float: left; + border-style: solid; + border-width: 1px; + border-color: #060505 #35332e #5e5953 #110e0c; + border-radius: 6px; + background: rgba(255,255,255,0); + background: -moz-linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,0.1)); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0)), color-stop(100%,rgba(255,255,255,0.1))); + background: -webkit-linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,0.1)); + background: -o-linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,0.1)); + background: -ms-linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,0.1)); + background: linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,0.1)); +} +#block-nodeblock-73{ + width: 122px; + font-size: 14px; + padding-left: 12px; + padding-right: 6px; +} +#block-nodeblock-73 .field-item a{ + display: block; + height: 32px; + line-height: 30px; + text-align: left; + font-size: 12px; + color: #a99777; + background: url(../gfx/camera-icon.png) 100% center no-repeat; +} +#block-nodeblock-73 .field-item a:hover{ + color: #FC6; +} +#block-weather-system-1 .weather-image{ + width: 24px; + height: 24px; + vertical-align: middle; + margin: 0 7px 4px; +} +#block-weather-system-1 .weather a, #block-textsize-form .textsize_list li a{ + width: 20px; + height: 20px; + display: inline-block; + vertical-align: top; + margin-top: 5px; + /*background: url(../gfx/header-widgets-button.png) 0 0 no-repeat;*/ + font-size: 14px; + line-height: 18px; + color: #ccc; + + border-style: solid; + border-width: 1px; + border-color: #585552 #181613 #0e0d0c #43403b; + border-radius: 3px; + background: #282420; + background: -moz-linear-gradient(top, #282420, #3e3933); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#282420), color-stop(100%,#3e3933)); + background: -webkit-linear-gradient(top, #282420, #3e3933); + background: -o-linear-gradient(top, #282420, #3e3933); + background: -ms-linear-gradient(top, #282420, #3e3933); + background: linear-gradient(top, #282420, #3e3933); +} +#block-textsize-form{ + margin: 0; +} +#block-textsize-form .content .list, #block-textsize-form .textsize_list, #block-textsize-form .textsize_list li{ + display: inline-block; + vertical-align: top; + margin: 0; + padding: 0; +} +#block-textsize-form .content .list{ + font-size: 12px; + line-height: 30px; + color: #a99777; + margin-right: 4px; + text-transform: lowercase; +} +#block-textsize-form .textsize_list li{ + padding: 0; + margin-right: 5px; +} +#block-textsize-form .textsize_list li a{ + text-align: center; + font-size: 17px; + line-height: 17px; +} + /** * Primary Navigation */ @@ -170,6 +287,7 @@ ul.menu li{ #block-nice-menus-1 .nice-menu{ float: none; display: inline-block; + margin-left: 43px; } #block-nice-menus-1 li { display: block; @@ -212,9 +330,7 @@ ul.menu li{ } #block-nice-menus-1 li.over>a { color: #fba700; - background: #471406; - opacity: 0.6; - filter: alpha(opacity='60'); + background: url(../gfx/main-menu-hover-bg.png) 0 0 repeat-x; text-shadow: #000 2px 2px 2px; filter: progid:DXImageTransform.Microsoft.Shadow(color=#0000FF,direction=45); } @@ -246,141 +362,172 @@ ul.menu li{ #block-nice-menus-1 .menuparent ul li a:hover{ background: #31150d; color: #ffcc66; + opacity: 1; + filter: alpha(opacity='100'); + text-shadow: none; } - - -/** - * Blog - */ -.blog-homepage-block h2 a { - text-decoration: none; +#block-nice-menus-1 ul li ul li ul{ + display: none !important; } -.blog-page-view .views-row, -.blog-homepage-block .views-row { - padding: 0 0 20px 0; - margin: 0 0 20px 0; - border-bottom: 1px solid #ccc; +/* +* +* Fixed menu* +*/ +.fixed-menu-wrapper{ + position: fixed; + top: 0; + left: 0; + z-index: 2; } - .blog-page-view .views-row-last, - .blog-homepage-block .views-row-last { - margin: 0; padding: 0; border-bottom: none; - } - -.blog-page-view .views-field-title h3, -.blog-homepage-block .views-field-title h3 { - padding: 0; - margin: 0; - font-size: 16px; - } - .blog-page-view .views-field-title h3 a, - .blog-homepage-block .views-field-title h3 a { - text-decoration: none; - } - -.blog-page-view .views-field-field-date, -.blog-homepage-block .views-field-field-date, -.node-blog .field-name-field-date { - font-style: italic; - font-size: 11px; - padding: 0 0 3px 0; - margin: 0; - } - -.blog-page-view .views-field-body .field-content a:last-child, -.blog-homepage-block .views-field-body .field-content a:last-child { - margin: 10px 0 0 0; - display: block; +.region-fixed-menu .block-menu{ + position: relative; + left: -200px; } - -/** - * Press Releases - */ -.view-press-releases .views-row { - padding: 0 0 20px 0; - margin: 0 0 20px 0; - border-bottom: 1px solid #ccc; +/* -- Search Form -- */ +#block-nice-menus-1, #block-search-form{ + display: inline-block; + vertical-align: top; } -.view-press-releases .views-row-last { margin: 0; padding: 0; border-bottom: none; } - .view-press-releases .views-row h3 { - padding: 0; - margin: 0; - font-size: 16px; - } - .view-press-releases .views-row h3 a { text-decoration: none; } - - .view-press-releases .views-row .views-field-field-date { - font-style: italic; - font-size: 11px; - padding: 0 0 3px 0; - margin: 0; - } - .view-press-releases .views-row .views-field-body .field-content a:last-child { - display: block; - padding: 10px 0 0 0; - } - -/** - * Testimonials - */ - -#homepage-testimonial-listing h2 a { text-decoration: none; } - -.view-testimonials .views-row { - padding: 0 0 20px 0; - margin: 0 0 20px 0; - border-bottom: 1px solid #ccc; +#block-search-form{ + width: 72px; + height: 40px; + margin-left: -6px; +} +#block-search-form .container-inline div, #block-search-form .container-inline label{ + display: block; +} +#block-search-form .search-icon{ + height: 40px; + position: relative; + background: url(../gfx/main-menu-hover-bg.png) 0 0 repeat-x; +} +#block-search-form .search-icon:after{ + width: 2px; + height: 40px; + content: ""; + background: url(../gfx/main-menu-separator.png) 0 0 no-repeat; + position: absolute; + top: 0; + right: -2px; +} +#block-search-form .search-icon a{ + height: 40px; + display: block; + background: url(../gfx/search-icon.png) center no-repeat; +} +#block-search-form .container-inline .search-wrapper{ + width: 237px; + height: 25px; + padding: 13px 11px 14px 17px; + background: #482218; + border-radius: 0 0 4px 4px; + float: right; + -moz-box-shadow: 0 0 10px #000; + -webkit-box-shadow: 0 0 10px #000; + box-shadow: 0 0 10px #000; + filter: progid:DXImageTransform.Microsoft.Shadow(color=#0000FF,direction=45); + display: none; + position: relative; + z-index: 2; +} +#block-search-form .search-wrapper>div{ + display: inline-block; + vertical-align: top; + margin: 0; +} +#block-search-form .search-wrapper input[type='text']{ + width: 171px; + height: 25px; + line-height: 24px; + color: #666; + font-size: 14px; + padding-left: 10px; + border: 1px solid #716353; +} +#block-search-form .search-wrapper input[type='submit']{ + width: 39px; + height: 30px; + display: block; + line-height: 24px; + margin-left: 9px; + color: #fff; + font-size: 15px; + border-width: 1px; + border-style: solid; + border-color: #716353 #2b2114 #2b2114 #716353; + background: #4b3822; + background: -moz-linear-gradient(top, #483520, #634e35); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#483520), color-stop(100%,#634e35)); + background: -webkit-linear-gradient(top, #483520, #634e35); + background: -o-linear-gradient(top, #483520, #634e35); + background: -ms-linear-gradient(top, #483520, #634e35); + background: linear-gradient(top, #483520, #634e35); + border-radius: 3px; +} +#block-search-form .search-wrapper input[type='submit']:hover{ + width: 39px; + height: 30px; + display: block; + line-height: 24px; + margin-left: 9px; + color: #fff; + font-size: 15px; + border-width: 1px; + border-style: solid; + border-color: #716353 #2b2114 #2b2114 #716353; + background: #4b3822; + background: -moz-linear-gradient(top, #634e35, #483520); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#634e35), color-stop(100%,#483520)); + background: -webkit-linear-gradient(top, #634e35, #483520); + background: -o-linear-gradient(top, #634e35, #483520); + background: -ms-linear-gradient(top, #634e35, #483520); + background: linear-gradient(top, #634e35, #483520); + border-radius: 3px; } -.view-testimonials .views-row.views-row-last { padding: 0; border: none; } - .view-testimonials .views-row h3 { - padding: 0; - margin: 0; - font-size: 16px; - } - .view-testimonials .views-row .views-field-field-testimonial-author { - font-style: italic; - font-size: 11px; - padding: 0 0 3px 0; - margin: 0; - } - .view-testimonials .views-row .views-field-body { padding: 0 0 5px 0; } -/** - * Services - */ -.view-services .view-content { padding: 20px 0 0 0; } - .view-services .views-row { - clear: both; - padding: 0 0 20px 0; - margin: 0 0 20px 0; - height: auto !important; - height: 100px; - min-height: 100px; - border-bottom: 1px solid #ccc; - } - .view-services .views-row-last { border: none; margin: 0; } - .view-services .views-row h3 { padding: 0 0 2px 0; margin: 0; } - .view-services .views-row h3 a { text-decoration: none; } - .view-services .views-row .views-field-field-service-image { - float: left; - margin: 0 20px 0 0; - } - .view-services .views-row .views-field-title { padding: 10px 0 0 0; } /** * Site Content */ - -.cta_global { display: block; } - .cta_global img { display: block; } - -#site-left-col .cta_global { margin: 0 0 10px 0; } - -#site-content { - clear: both; - margin: 0 0 20px 0; - } +#site-content{ + padding: 20px 30px 40px 50px; + clear: both; + margin: 10px 0 20px 0; + background: url(../gfx/content-bg-center.png) 0 0 repeat-y; + position: relative; +} +#site-content:before{ + content: ''; + width: 960px; + height: 315px; + background: url(../gfx/content-bg-top.png) 0 0 no-repeat; + position: absolute; + top: -5px; + left: 0; +} +#site-content:after{ + content: ''; + width: 960px; + height: 188px; + background: url(../gfx/content-bg-bottom.png) 0 0 no-repeat; + position: absolute; + bottom: -5px; + left: 0; +} +#col-left, #col-right{ + float: left; + position: relative; + z-index: 1; +} +#col-left{ + width: 580px; + margin: 0 35px 0 0; +} +#col-right{ + width: 265px; +} #site-wrapper.page-content #site-content { margin-top: 30px; } #site-content .article_header { color: #666; @@ -389,68 +536,6 @@ ul.menu li{ font-weight: normal; } -/* -- Layout A -- */ - -#site-content #col-left { - float: left; - width: 220px; - } - #site-content #col-left .add-pad {} - #site-content #col-left section { - margin: 0; - padding: 0 0 24px 0; - } -#site-content #col-right { - float: right; - width: 720px; - } - #site-content #col-right .add-pad {} - -/* -- Layout B -- */ - -#site-content #col-left-b { - float: left; - width: 720px; - } - #site-content #col-left-b .add-pad {} - -#site-content #col-right-b { - float: right; - width: 220px; - } - #site-content #col-right-b .add-pad {} - #site-content #col-right-b section { - margin: 0; - padding: 0 0 24px 0; - } - -/* -- Layout C -- */ - -#site-content #col-left-c { - float: left; - width: 220px; - } - #site-content #col-left-c .add-pad {} - #site-content #col-left-c section { - margin: 0; - padding: 0 0 24px 0; - } -#site-content #col-mid-c { - float: left; - width: 510px; - } - #site-content #col-mid-c .add-pad { padding: 0 20px 0 20px; } -#site-content #col-right-c { - float: right; - width: 220px; - } - #site-content #col-right-c .add-pad { } - -/* -- Layout Span -- */ - -#site-content #col-left-span { width: 950px; } - #site-content #col-left-span .add-pad { } - /** * Site Content */ @@ -498,43 +583,6 @@ section#testimonials article.column { } #site-left-col-content { padding: 14px 0 0 0; } -#sec-nav-cont { margin: 0 0 30px 0; } - #sec-nav-cont h2 { padding-top: 0 !important; } - #sec-nav-cont a { text-decoration: none; } - #sec-nav-cont #h_sec_nav { - display: block; - color: #000; - font-size: 28px; - letter-spacing: 3px; - margin: 0 0 10px; - padding: 0; - text-transform: uppercase; - text-decoration: none; - } - #sec-nav-cont #sec_nav { - margin: 0; - padding: 0; - } - #sec-nav-cont #sec_nav li { - background-color: #F0F0F0; - margin-bottom: 2px; - } - #sec-nav-cont #sec_nav li a { - color: #000; - display: block; - font-size: 16px; - font-weight: normal; - padding: 10px; - text-decoration: none; - text-transform: uppercase; - width: 156px; - } - #sec-nav-cont #sec_nav li a:hover, - #sec-nav-cont #sec_nav li a.active { - color: #B68C44; - text-decoration: none; - } - #sec-nav-cont #sec_nav li li a { padding: 10px 10px 10px 26px; } /** * Footer @@ -543,108 +591,38 @@ section#testimonials article.column { footer { position: relative; clear: both; + background: url(../gfx/footer-bg.png) 0 0 repeat-x; + padding-top: 20px; + min-height: 225px; } footer #site-footer { margin: 0 auto; padding: 0; width: 960px; + position: relative; } + footer #site-footer:before, footer #site-footer:after{ + content: ''; + width: 199px; + height: 225px; + position: absolute; + top: 0; + } + footer #site-footer:before{ + background: url(../gfx/footer-bg-left.png) 0 0 no-repeat; + left: -199px; + } + footer #site-footer:after{ + background: url(../gfx/footer-bg-right.png) 0 0 no-repeat; + position: absolute; + right: -199px; + } footer #site-footer #ft-top { - background: #c1c1c1; width: 960px; } footer #site-footer #ft-top .add-pad { padding: 0px 10px 0 10px; } - footer #site-footer #ft-bot { - background: #222; - height: 45px; - } footer #site-footer #ft-bot .add-pad { padding: 12px 20px 0 20px; } -/* -- Newsletter Signup -- */ - -#newsletter-signup-form { - margin: 0 0 12px 0; - padding: 0 0 0px 0; - float: left; - width: 480px; - } - #newsletter-signup-form h2 { - font-size: 18px; - font-weight: bold; - color: #333; - line-height: 20px; - } - #newsletter-signup-form .form-item, - #newsletter-signup-form .form-actions { - margin: 0 10px 0 0; - padding: 0; - float: left; - } - #newsletter-signup-form input.form-text { - border: 1px solid #777 !important; - width: 148px !important; - padding: 1px 4px !important; - } - #newsletter-signup-form input.form-submit { - margin: 0; - padding: 0; - display: block; - width: 72px; - height: 24px; - line-height: 48px; - background: url(../gfx/b_submit_sm.png) 0 0 no-repeat; - text-decoration: none; - text-indent: -9999px; - border: 0; - float: left; - } - #newsletter-signup-form input#edit-submit--2:hover { background-position: 0 -24px; } - -/* -- Search Form -- */ - -#search-form { - margin: 0 0 12px 0; - padding: 0; - float: right; - width: 260px; - } - #search-form h2 { - font-size: 18px; - font-weight: bold; - color: #333; - line-height: 20px; - } - #search-form .form-item, - #search-form .form-actions { - margin: 0; - padding: 0; - } - #search-form .form-item-search-block-form { - display: block; - float: left; - margin: 0 10px 0 0; - } - - #search-form input.form-text { - border: 1px solid #777; - width: 148px; - padding-left: 4px; - } - #search-form input.form-submit { - margin: 0; - padding: 0; - display: block; - width: 72px; - height: 24px; - line-height: 48px; - background: url(../gfx/b_search_sm.png) 0 0 no-repeat; - text-decoration: none; - text-indent: -9999px; - border: 0; - float: left; - } - #search-form input#edit-submit:hover { background-position: 0 -24px; } - /* -- Social Media -- */ #sm-nav-cont { @@ -683,13 +661,29 @@ footer { #footer-nav-cont #footer_nav li a { display: block; float: left; - font-size: 16px; - color: #999; + font: 10px/12px Verdana; + color: #7a746f; text-decoration: none; - margin: 0 14px; - text-transform: uppercase; + margin: 0 10px 0 0; + padding-right: 14px; + position: relative; } - #footer-nav-cont #footer_nav li a:hover { color: #fff; } + #footer-nav-cont #footer_nav li a:after{ + content: '/'; + position: absolute; + top: 0; + right: 0; + } + #footer-nav-cont #footer_nav li.last a:after{ + content: ''; + position: absolute; + top: 0; + right: 0; + } + #footer-nav-cont #footer_nav li a:hover:after{ + color: #7a746f; + } + #footer-nav-cont #footer_nav li a:hover { color: #fff; } /* -- Footer Text -- */ @@ -697,62 +691,18 @@ footer { padding: 10px 0 10px 0; line-height: 12px; width: 960px; - } - #footer-text p { - margin: 0; - padding: 0; - font-size: 9px; - font-family: Verdana, Geneva, sans-serif; - line-height: 12px; - } - #footer-text p#ft-copy { color: #999; float: left; width: 480px; } - #footer-text p#ft-copy a { color: #999; text-decoration: none; } - #footer-text p#ft-copy a:hover { text-decoration: underline; } - - #footer-text p#ft-acro { color: #999; float: right; width: 480px; text-align: right; } - #footer-text p#ft-acro a { color: #999; text-decoration: none; } - #footer-text p#ft-acro a:hover { text-decoration: underline; } - -/** - * Contact Us - */ - -#contact-us-content { - margin: 0; - padding: 0; - float: left; - width: 460px; - } -#contact-us-map { - margin: 0; - padding: 0; - float: right; - width: 460px; - } - -#contact-us-content input#edit-submit { - margin: 0; - padding: 0; - text-decoration: none; - border: 0; - text-indent: -9999px; - width: 144px; - height: 29px; - line-height: 29px; - background: url(../gfx/b_submit.png) 0 0 no-repeat; - display: block; - } - #contact-us-content input#edit-submit:hover { background-position: 0 -29px; } - -/** - * Site Map - */ +} +#footer-text p { + margin: 0; + padding: 0; + font-size: 100%; + font-family: Verdana, Geneva, sans-serif; + line-height: 12px; +} +#footer-text #ft-copy, #footer-text #ft-acro { color: #999; float: left; width: 480px; } +#footer-text #ft-copy a, #footer-text #ft-acro a { color: #999; text-decoration: none; } +#footer-text #ft-copy a:hover, #footer-text #ft-acro a:hover { text-decoration: underline; } -#site-map { - margin: 0; - padding: 0; - } - #site-map ul li, #site-map ul li.leaf, #site-map ul li.expanded { padding-left: 15px; } /** * Webforms @@ -921,224 +871,121 @@ footer { .no_scroller #b-image-gallery-next { display: none !important; } .no_scroller #image-gallery-nav-items { margin: 0 !important; } +/* +* FRONT PAGE +* +*/ +.front #page-title, .front #block-system-main{ + display: none; +} +.block-nodeblock .content .contextual-links-wrapper {display: none;} +.front #block-views-what-s-new-block-1 h2{ + height: 64px; + font: 28px/48px Georgia; + text-transform: capitalize; + color: white; + text-shadow: black 2px 2px 2px; + position: relative; + left: -63px; + background: url(../gfx/content-news-title.png) 0 0 no-repeat; + padding: 0 0 0 63px; +} -/* -- Portfolio -- */ - -.gallery-item { - float: left; - display: block; - width: 200px; - margin: 0 33px 20px 0; - } - .gallery-item a { display: block; text-decoration: none; cursor: pointer; } - .gallery-item a * { display: block; cursor: pointer; } - - .gallery-item .gallery-item-image { margin: 0 0 10px 0; } - .gallery-item .gallery-item-title { - display: block; - font: 20px/23px Verdana, Arial, Helvetica, sans-serif; - padding: 0 0 4px 0; - } - -/******************************************* - * > Ubercart Styles - *******************************************/ -.product-category { - background-color: #F3F3F3; - margin: 0 0 10px; - padding: 10px; - overflow: hidden; -} - .product-category .cat-image { - float: left; - padding: 7px 0 0; - width: 110px; - } - .product-category .cat-data { - float: left; - width: 570px; - } - .cat-data p { - color: #333; - } - .cat-data h2 { - font-family: Verdana, Geneva, sans-serif; - font-size: 18px; - font-weight: bold; - line-height: 21px; - padding: 2px 0 4px 0; - } - .cat-data h2 a { - color: #575757; - text-decoration: none; - } - .cat-data h2 a:hover { color: #000; } -.product-title { padding-bottom: 0; } -#product-content { padding-top: 14px; } -#product-images { - float: left; - width: 330px; +/* +* News +* +*/ +.view-what-s-new .views-row{ + background: url(../gfx/content-news-border-bottom.png) 0 bottom no-repeat; + padding-bottom: 17px; + margin-bottom: 17px; +} +.news-content-title{ + margin-bottom: 5px; +} +.news-content-title a{ + font: 165%/110% Georgia; + color: #600; +} +.news-content-body, .news-content-video{ + font-size: 115%; + line-height: 160%; +} +.news-content-video{ + margin-bottom: 20px; +} +.news-content-read-more a{ + display: inline-block; + font-size: 100%; + line-height: 180%; + color: #fff; + text-transform: uppercase; + border-radius: 3px; + background: #633; + padding: 0 11px 0 15px; +} +.news-content-read-more a:hover{ + background: #900; } - #product-main-image img { border: #ebebeb solid 10px; } - #product-thumbnails { - margin: 10px 0; - overflow: hidden; - width: 300px; - } - #product-thumbnails a { - border: #ebebeb solid 4px; - display: block; - float: left; - height: 35px; - margin: 0 10px 5px 0; - width: 35px; - } -#product-details { - float: left; - margin-left: 14px; - width: 356px; +/* +* CTAs +* +*/ +#col-right .view-id-ctas .views-row{ + width: 120px; + display: inline-block; + text-align: center; +} +#col-right .view-id-ctas .views-row-odd{ + margin-right: 20px; +} +#col-right .view-id-ctas .views-row a{ + font: bold 105%/150% Tahoma; + color: #633; +} +#col-right .view-id-ctas .views-row a:hover{ + color: #900; } - #product-details ul { - list-style: none; - margin: 0; - padding: 0; - } - #product-details ul li { - background: none; - padding: 0; - } - #product-details li.label-product-title { - color: #000; - font-size: 20px; - font-weight: bold; - margin: 0 0 5px 0; - } - #product-details li.label-product-price { - color: #000; - font-size: 16px; - margin: 0 0 5px 0; - } - #product-details li.label-product-model { - color: #000; - } - #product-details .mcta { - background-color: #eee; - border: #ccc solid 1px; - margin: 20px 0 10px 0; - padding: 0; - width: 218px; - } - #product-details .mcta p { - color: #000; - margin: 0 0 20px 0; - padding: 20px 0 0 0; - text-align: center; - } - -/** - * Comments - */ -.blog_post ul.links { display: none; } -#comments ul.links { display: inherit; } - -#comment-form .form-text, #comment-form .form-textarea { - background: #fff; - color: #666; - border: 1px solid #ccc; - padding: 5px; - } - #comment-form .form-item input.error, #comment-form .form-item textarea.error, #comment-form .form-item select.error { border: 2px solid red; } - -#comment-form span.form-required { display: none !important; } -#comments .filter-wrapper { display: none !important; } -#comments .grippie { display: none !important; } - -#comment-body-add-more-wrapper .filter-wrapper { display: none !important; } -#comment-body-add-more-wrapper .grippie { display: none !important; } - -#comments { - clear: both; - padding: 15px 0 20px 0; - } - #comments h2 { - font-size: 16px; - margin: 0 0 6px 0; - padding: 0; - } - #comments h3 { - font-size: 15px; - margin: 0 0 6px 0; - padding: 0; - } - .comment .links { margin: 0; padding: 0; } - .comment .links li { - display: inline; - margin: 0 10px 0 0; - padding: 0; - background: none; - } - -.comment-text .content { padding: 0 0 10px 0; } - -/* -- Actual Comment Entry -- */ - -.comment { - padding: 10px; - margin: 0 0 10px 0; - background: #f3f3f3; - border-bottom: 3px solid #dedede; - } - .comment .submitted { color: #686868; font-size: 11px; } - .comment span.new { display: none; } - -.comment-author-info { } - .commenter-name { font-weight: bold; } - .comment-time { font-style: italic; } - -#comment-controls { - clear: both; - padding: 12px 0 0 0; - } -#comment-form #edit-submit { - display: block; - padding: 0; - margin: 0; - width: 111px; - height: 24px; - line-height: 24px; - font-size: 0; - text-align: left; - text-indent: -9999px; - overflow: hidden; - outline: none; - border: none; - cursor: pointer; - background: url(../gfx/b_post_comment.png) no-repeat; - } - -/** - * FAQ - */ -.faq-question-answer {} - .faq .faq-question { - background: #C1C1C1; - padding: 8px; - border: 1px solid #222; - color: #222; - cursor: pointer; - } - .faq .faq-question a { - color: #222; - text-decoration: none; - font-weight: bold; - } - .faq .faq-question-answer.expanded .faq-question, - .faq .faq-question:hover { - background: #F0F0F0; - } - .faq .faq-answer { - border: 1px solid #222; - padding: 8px; - } - +/* +* Footer Three Blocks +* +*/ +.region-footer-3-blocks>div{ + width: 296px; + display: inline-block; + vertical-align: top; +} +.region-footer-3-blocks #block-nodeblock-75{ + margin: 0 31px; +} +.region-footer-3-blocks h2{ + padding: 138px 0 7px; + font: 18px/18px Georgia; + text-transform: uppercase; + color: #ccc; + text-align: center; +} +.region-footer-3-blocks #block-nodeblock-74 h2{ + background: url(../gfx/footer-3-blocks-visitors-title.png) 0 0 no-repeat; +} +.region-footer-3-blocks #block-nodeblock-75 h2{ + background: url(../gfx/footer-3-blocks-edc-title.png) 0 0 no-repeat; +} +.region-footer-3-blocks #block-nodeblock-76 h2{ + background: url(../gfx/footer-3-blocks-public-works-title.png) 0 0 no-repeat; +} +.region-footer-3-blocks>div>.content{ + background: #14110c; + border: 1px solid #0e0c08; + border-radius: 0 0 5px 5px; + padding: 18px 18px 22px 22px; + color: #ccc; + box-shadow: inset 0 0 4px #0e0c08; +} +.region-footer-3-blocks>div>.content a{ + color: #fff; +} +.region-footer-3-blocks>div>.content a:hover{ + color: #fc6; +} diff --git a/sites/all/themes/merritt/gfx/socials/Thumbs.db b/sites/all/themes/merritt/gfx/socials/Thumbs.db old mode 100755 new mode 100644 diff --git a/sites/all/themes/merritt/js/script.js b/sites/all/themes/merritt/js/script.js index 76a7fe9..1ee1f5b 100644 --- a/sites/all/themes/merritt/js/script.js +++ b/sites/all/themes/merritt/js/script.js @@ -19,17 +19,6 @@ $(function() { } /* -- Default Text For Forms -- */ - // Newsletter Sign-Up Email Field - $("#webform-client-form-21 #edit-submitted-your-e-mail-address, #webform-client-form-21--2 #edit-submitted-your-e-mail-address--2").focus(function(srcc) { - if($(this).val() == "Your E-Mail (Required)") { - $(this).val(""); - } - }); - $("#webform-client-form-21 #edit-submitted-your-e-mail-address, #webform-client-form-21--2 #edit-submitted-your-e-mail-address--2").blur(function() { - if($(this).val() == "") { - $(this).val("Your E-Mail (Required)"); - } - }); // sign up form $("#webform-client-form-21 #edit-submitted-name.required").defaultValue("Your Name (Required)"); @@ -38,7 +27,7 @@ $(function() { $("#webform-client-form-21--2 #edit-submitted-name--2").defaultValue("Your Name (Required)"); // search form - $('#search-block-form .form-text').defaultValue("Enter Keyword..."); + $('#search-block-form .form-text').defaultValue("Search Site"); /* -- Image Gallery -- */ if($('#image-gallery-cont').length) { @@ -270,3 +259,62 @@ jQuery.fn.defaultValue = function(text){ }); }); }; +(function($){ +Drupal.behaviors.custom = { attach: function (context, settings) { + //Show/Hide search field + $('.search-icon').click(function() { + if($(this).parent().find('.search-wrapper').hasClass('show')){ + $(this).parent().find('.search-wrapper').removeClass("show").slideUp(); + }else{ + $(this).parent().find('.search-wrapper').addClass("show").slideDown(); + } + + }); + $('.search-wrapper #edit-submit').val('GO'); + + + //Menu "I want to.." + + $('.region-fixed-menu .block-menu ul.menu li.expanded a').each(function(){ + $(this).addClass('convolute'); + $(this).parent().removeClass('expanded'); + $(this).next().hide(); + }); + + + //Show menu "I want to.." + $(".fixed-menu-button", context).toggle(function(){ + $(".region-fixed-menu .block-menu").animate({"left": "+=192px"}, "slow"); + + //extanded menu + $('.region-fixed-menu .block-menu ul.menu a.convolute', context).toggle(function(){ + $(this).toggleClass("convolute"); + $(this).toggleClass("expanded"); + $(this).next().slideDown(); + return false; + },function(){ + $(this).toggleClass("expanded"); + $(this).toggleClass("convolute"); + $(this).next().slideUp(); + return false; + }); + $(this).html("close"); + return false; + },function(){ + $('.region-fixed-menu .block-menu ul.menu a.expanded', context).each(function(){ + $(this).addClass('convolute'); + $(this).removeClass('expanded'); + $(this).next().slideUp(); + }); + $(".region-fixed-menu .block-menu").animate({"left": "-=192px"}, "slow"); + // $(this).toggleClass("active"); $("#block-menu-menu-i-want-to").animate({"width": "-=230px",opacity: "hide"}, "slow"); + $(this).html("I want to ..."); + + return false; + }); + + + + +}}; +})(jQuery); diff --git a/sites/all/themes/merritt/merritt.info b/sites/all/themes/merritt/merritt.info index ff3f853..71020fb 100644 --- a/sites/all/themes/merritt/merritt.info +++ b/sites/all/themes/merritt/merritt.info @@ -8,15 +8,16 @@ core = 7.x settings[shortcut_module_link] = 0 ; REGIONS +regions[header_widgets] = Header Widgets regions[content] = Content +regions[sidebar] = Sidebar regions[header_menu] = Header Menu regions[fixed_menu] = Fixed Menu regions[main_content_menu] = Main Content Menu -regions[search_form] = Footer - Search -regions[newsletter_signup_form] = Footer - Newsletter Signup Form regions[sub_ctas] = Sub CTAs regions[product_cta] = Product CTA regions[footer_text] = Footer Text +regions[footer_3_blocks] = Footer 3 Blocks ; CSS stylesheets[all][] = css/style.css diff --git a/sites/all/themes/merritt/templates/comment-wrapper.tpl.php b/sites/all/themes/merritt/templates/comment-wrapper.tpl.php deleted file mode 100644 index 38ce31d..0000000 --- a/sites/all/themes/merritt/templates/comment-wrapper.tpl.php +++ /dev/null @@ -1,53 +0,0 @@ - - -
> - type != 'forum'): ?> - -

- - - - - - -

- - -
diff --git a/sites/all/themes/merritt/templates/comment.tpl.php b/sites/all/themes/merritt/templates/comment.tpl.php deleted file mode 100644 index e662477..0000000 --- a/sites/all/themes/merritt/templates/comment.tpl.php +++ /dev/null @@ -1,96 +0,0 @@ -created variable. - * - $changed: Formatted date and time for when the comment was last changed. - * Preprocess functions can reformat it by calling format_date() with the - * desired parameters on the $comment->changed variable. - * - $new: New comment marker. - * - $permalink: Comment permalink. - * - $submitted: Submission information created from $author and $created during - * template_preprocess_comment(). - * - $picture: Authors picture. - * - $signature: Authors signature. - * - $status: Comment status. Possible values are: - * comment-unpublished, comment-published or comment-preview. - * - $title: Linked title. - * - $classes: String of classes that can be used to style contextually through - * CSS. It can be manipulated through the variable $classes_array from - * preprocess functions. The default values can be one or more of the following: - * - comment: The current template type, i.e., "theming hook". - * - comment-by-anonymous: Comment by an unregistered user. - * - comment-by-node-author: Comment by the author of the parent node. - * - comment-preview: When previewing a new or edited comment. - * The following applies only to viewers who are registered users: - * - comment-unpublished: An unpublished comment visible only to administrators. - * - comment-by-viewer: Comment by the user currently viewing the page. - * - comment-new: New comment since last the visit. - * - $title_prefix (array): An array containing additional output populated by - * modules, intended to be displayed in front of the main title tag that - * appears in the template. - * - $title_suffix (array): An array containing additional output populated by - * modules, intended to be displayed after the main title tag that appears in - * the template. - * - * These two variables are provided for context: - * - $comment: Full comment object. - * - $node: Node object the comments are attached to. - * - * Other variables: - * - $classes_array: Array of html class attribute values. It is flattened - * into a string within the variable $classes. - * - * @see template_preprocess() - * @see template_preprocess_comment() - * @see template_process() - * @see theme_comment() - */ -?> -
> - -
- - - -
-

-   Posted on: -

-
-
- -
-
- - - - - -
> - - -
- -
- -
- - -
-
diff --git a/sites/all/themes/merritt/templates/maintenance-page.tpl.php b/sites/all/themes/merritt/templates/maintenance-page.tpl.php index 9c35121..509440c 100644 --- a/sites/all/themes/merritt/templates/maintenance-page.tpl.php +++ b/sites/all/themes/merritt/templates/maintenance-page.tpl.php @@ -31,16 +31,16 @@