Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ting_search_carousel #1

Open
wants to merge 108 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
31915bd
Updated settings page with frontend settings making it possible to ch…
zorp Jul 24, 2012
6961f6d
Updating rs.carousel to latest version and moving add js to module in…
zorp Jul 25, 2012
2b3760c
Begun refactoring of css and markup to be more flexible and become co…
zorp Jul 26, 2012
9b2ffd2
Added new custom styling
magnify Jul 27, 2012
4285f0b
cleaning up
zorp Jul 27, 2012
ef63521
Resloved merge conflict
magnify Jul 30, 2012
4529898
Added overflow hidden to prev/next buttons to prevent outline stretch…
magnify Jul 30, 2012
ddd7253
Fixed arrow pseudo element so it works in webkit browsers
magnify Jul 30, 2012
654720b
Removed unused image, fixed markup and added equal widths js code and…
magnify Jul 30, 2012
19d45d4
Added margin bottom
magnify Jul 30, 2012
67013b1
Added check to make sure tabs only gets printed if there is more than…
magnify Jul 30, 2012
3bc87ea
Renamed js folder to scripts
magnify Jul 31, 2012
b1b604e
Added scripts library and compass files
magnify Jul 31, 2012
7c1e34c
Added scss file and converted css to scss
magnify Jul 31, 2012
88955c8
Introduce default style 'Scale/crop'
ubcudvikler Jul 31, 2012
89ea743
CHanged idsplay now to scale and crop and added todo message
magnify Jul 31, 2012
4c7273f
Removed top from navigational tabs position and made 'Bottom' default.
ubcudvikler Jul 31, 2012
8bf14dc
Add UI for global descriptions toggle.
ubcudvikler Jul 31, 2012
8ab9f42
bugfix: ';' replaced with ','
ubcudvikler Jul 31, 2012
8cff92f
Add css class 'rs-carousel-wide' if descriptions are shown and 'rs-ca…
ubcudvikler Jul 31, 2012
aea64b5
Bugfix: Learning that the true meaning of required is always checked.
ubcudvikler Jul 31, 2012
c0d6e1d
remove title-div if description are not shown
ubcudvikler Jul 31, 2012
9696c28
Reposition left arrow to be closer to slide elements
zorp Aug 6, 2012
ccac508
Removed settings for tab positions as slideshow still only support bo…
zorp Aug 10, 2012
9e5b0bd
Overwrote .ui-state-disabled to remove opacity overlay
kaa4ever Aug 14, 2012
32c74a5
Fixed styling, reponsive, IE 8
magnify Aug 17, 2012
8036be3
Moved compact styling down
magnify Aug 17, 2012
f6de4e8
Moved previous arrow
magnify Aug 17, 2012
e18dfbc
Resloved merge conflict in deletion of test files
zorp Aug 17, 2012
4972768
Fixed width of ul container for slide elements and made sure arrows a…
zorp Aug 17, 2012
c6affbc
Added refresh on window resize so carousel is responsive
zorp Aug 30, 2012
63d1fc5
Clean up search carousel pages include file
cableman Sep 3, 2012
aba15a4
Reverted scripts folder to js as befits a module
cableman Sep 7, 2012
107b687
Reverted scripts folder to js as befits a module part 2
cableman Sep 7, 2012
ee35f35
Removed ruby sass config file
cableman Sep 7, 2012
03e1b58
Removed dead code from the modules image style
cableman Sep 7, 2012
652713b
Refactored the theme functions and moved tpls into a folder
cableman Sep 7, 2012
f112ecc
Removed drupal functions from the tpl's and fix cache error
cableman Sep 7, 2012
ae33674
Rewritten cache handling and remove cron function, which blocks cron …
cableman Sep 7, 2012
1343989
Restructed the coding style
cableman Sep 7, 2012
3b51fab
Updated JavaScript so it validates
cableman Sep 7, 2012
9d80338
Update JS to use document ready as its faster then drupal behaviours …
cableman Sep 7, 2012
2e88af6
Added ajax spinner to make carousel more responsvie to user input
cableman Sep 7, 2012
8435d0e
Prepared the module for do_request rewrite by implementing a better c…
cableman Sep 7, 2012
3d2ade6
Updated styling of ajax spinner to match responsive design
cableman Sep 7, 2012
df231c1
Remove search on administration submit and add cache clear on the sam…
cableman Sep 7, 2012
1abe93c
Rewritten the cover search and download process
cableman Sep 7, 2012
80b067d
Updated the documentation
cableman Sep 7, 2012
006f7f1
Updated javascript with local cache
cableman Sep 7, 2012
607ae6c
Ensured that the subtitle is show even when the backend is not yieldi…
cableman Sep 10, 2012
6bff20e
Removed margin bottom
magnify Oct 29, 2012
7a66a7d
Updated image style size to be larger so theme layer get better contr…
zorp Jan 23, 2013
97021d7
Added make file
cableman Apr 22, 2013
52f3369
Cleaned up styling and removed sass and compass requirement
magnify May 6, 2013
a6b089b
Changed makefile to point to ding2 on github
cableman May 6, 2013
83a6080
Removed unnecessary display block
magnify May 6, 2013
d91b5ec
Removed ul to avoid to specific selector
magnify May 6, 2013
529251b
Added select for use with responsive, changed the way active class is…
magnify May 7, 2013
3398633
Testing on click touch instead of click
magnify May 7, 2013
f914ccd
Attached click event to tabs and change to select
magnify May 7, 2013
da4fbb4
Removed return false
magnify May 8, 2013
b4aa41f
Updated carousel scripts to newest versions with touch support
cableman May 8, 2013
da896aa
Added event drag library
cableman May 8, 2013
7418b6f
Added hardware support for iOS and dragable items
cableman May 8, 2013
cddb276
Disable hardware support
cableman May 8, 2013
3b004bf
Trying to use another touch library that might work better with android
cableman May 8, 2013
70cb706
Removed touch for now
cableman May 8, 2013
118b350
Trying out jGestures for touch events
cableman May 8, 2013
1fbea4b
Now with real touch support
cableman May 8, 2013
65f69ae
Ensured that navigation arrows are not shown on touch devices
cableman May 8, 2013
043f2e6
Style loader
magnify May 13, 2013
e401312
Removed min height
magnify May 13, 2013
d749762
Merge remote-tracking branch 'origin' into release
cableman Jun 4, 2013
db1569d
Merge branch 'release' into development
cableman Jun 5, 2013
c7fde86
Merge remote-tracking branch 'origin' into release
cableman Jun 10, 2013
b38809b
Added goto page after tab change
cableman Jun 10, 2013
8a16be6
Removed minified codekit version
cableman Jun 10, 2013
81ffbc2
Merge remote-tracking branch 'origin' into release
cableman Jun 11, 2013
72eb239
Added missing newlines
cableman Jun 13, 2013
2bdbe05
Removed fetch of 45 covers at a time as this is now handled in ting_c…
cableman Jun 13, 2013
74c9f7c
Merge branch 'core-pr-3' into development
cableman Jun 13, 2013
732de6d
Updated make file to point to ding2tal
cableman Jun 24, 2013
3d0142c
Changed makefile to use development branch
cableman Jun 24, 2013
313f063
Merge pull request #4 from ding2tal/core-pr-3
kasperg Jul 3, 2013
8f56a18
Merge branch 'master' into release
cableman Jul 3, 2013
503a3a9
Updated makefile to point to development branch and ding2tal
cableman Jul 3, 2013
f58cd02
Resolved merge conflict with release branch
cableman Jul 3, 2013
c506de7
Merge remote-tracking branch 'origin' into release
cableman Jul 3, 2013
a462555
Updated makefile to point to tag 7.x-1.0-beta2
cableman Nov 4, 2013
c56004c
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
9dc6614
Fixed missing options end tag
cableman Nov 27, 2013
c2e4e38
Removed a tags inside options
cableman Nov 27, 2013
47f9b30
Merge remote-tracking branch 'origin' into release
cableman Dec 12, 2013
e2c4a4c
Updated makefile to point to tag 7.x-1.0-beta4
cableman Dec 12, 2013
b1afad1
Updated coding style
cableman Dec 18, 2013
47ebfb6
Merge remote-tracking branch 'origin' into release
cableman Dec 18, 2013
fb0e0b4
Updated makefile to point to tag 7.x-1.0-beta5
cableman Dec 18, 2013
c7f2a85
Updated makefile to point to tag 7.x-1.0-rc1
cableman Dec 20, 2013
5e48171
Updated makefile to point to tag 7.x-1.0-rc2
cableman Jan 8, 2014
471b85c
Updated makefile to point to tag 7.x-1.0-rc3
cableman Jan 20, 2014
d673d14
Updated makefile to point to ding2 master branches
cableman Feb 3, 2014
cd6bd4b
Fixed indention in js file
cableman Jun 3, 2014
e190e32
Merge pull request #5 from ding2tal/core-pr-4
kasperg Jul 18, 2014
9305c05
Issue #209 by agnetemoos: Removed functionality to hide arrows on tou…
agnetemoos Feb 16, 2015
cc421c5
Merge pull request #6 from bibsdb/arrows_on_touch_screens
kasperg Apr 23, 2015
e8e054f
Issue 1104 by Pjohans: implement hook_permission
pjohans Aug 20, 2015
211a00c
Issue 1104 by Pjohans: Allow more users to administer carousel
pjohans Sep 9, 2015
0b0adb8
Merge pull request #15 from pjohans/Issue1104
cableman Oct 28, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.sass-cache/
23 changes: 23 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Require any additional compass plugins here.

# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "sass"
images_dir = "images"
javascripts_dir = "js"

output_style = :expanded
environment = :production

relative_assets = true

line_comments = false
color_output = false


# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
228 changes: 77 additions & 151 deletions css/ting_search_carousel.css
Original file line number Diff line number Diff line change
@@ -1,195 +1,121 @@
.ting-search-carousel {
width: 100%;
}

.ting-search-carousel .search-controller {
height: 20px;
list-style: none outside none;
margin: 0;
padding: 0;
width: 100%;
}

.ting-search-carousel .search-controller li.active {
background: none repeat scroll 0 0 #918F91;
}

.ting-search-carousel .search-controller li {
background: none repeat scroll 0 0 #D1D9D7;
float: left;
font-size: 11px;
height: 18px;
line-height: 15px;
margin: -1px 2px 0 0;
padding: 0 17px;
}

.ting-search-carousel .search-controller li a {
font-size: 11px;
line-height: 15px;
}

.ting-search-carousel .ting-search-results {
/* ==========================================================================
ting search carousel styling
========================================================================== */
.rs-carousel,
.rs-carousel-mask,
.rs-carousel-runner {
position: relative;
height: 200px;
}

.ting-search-carousel .ting-search-results .subtitle {
font-size: 42px;
font-weight: normal;
line-height: 0.9;
margin: 10px 0 0 40px;
.rs-carousel-mask,
.rs-carousel-runner {
overflow: hidden;
padding: 10px 0 10px 10px;
text-transform: uppercase;
width: 250px;
}

.ting-search-carousel .ting-search-results .info {
height: 39px;
margin-top: -3px;
.rs-carousel-inner {
overflow: hidden;
width: 100px;
}

.ting-search-carousel .ting-search-results .info span {
display: block;
font-size: 10px;
line-height: 1.25;
text-align: center;
}

.ting-search-carousel .ting-rs-carousel, .subtitle {
float: left;
rs-carousel-runner {
-moz-transform: translate3d(0, 0, 0);
-webkit-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}

/* carousel */
.ting-search-carousel .rs-carousel {
opacity: 1 !important;
overflow: hidden;
width: 580px;
.rs-carousel-transition .rs-carousel-runner {
-moz-transition: -moz-transform .400s ease;
-webkit-transition: -webkit-transform .400s ease;
-o-transition: -o-transform .400s ease;
-ms-transition: -ms-transform .400s ease;
transition: transform .400s ease;
}

.ting-search-carousel .rs-carousel .rs-carousel-mask {
position:relative;
height: 200px;
}

.ting-search-carousel .rs-carousel .rs-carousel-runner {
left: 0;
list-style: none;
margin: 0;
/* Pagination and previous and next buttons
========================================================================== */
.rs-carousel-action-prev,
.rs-carousel-action-next {
background-image: url('../images/arrows.png');
height: 55px;
overflow: hidden;
padding: 0;
margin-top: -27px;
position: absolute;
width: 580px;
}

.ting-search-carousel .rs-carousel .rs-carousel-item img {
max-width: 112px;
height: 140px;
}
.ting-search-carousel .no-js .rs-carousel .rs-carousel-runner {
position: static;
}

.ting-search-carousel .rs-carousel .rs-carousel-item {
float: left;
height: 180px;
overflow: hidden;
padding-top: 20px;
text-align: center;
padding-right: 16px;
width: 100px;
}

.ting-search-carousel .rs-carousel.rs-carousel-vertical .rs-carousel-item {
float: none;
text-indent: -1000px;
top: 50%;
width: 55px;
}

/* pagination */
.ting-search-carousel .rs-carousel-pagination {
list-style: none;
margin: 0;
padding: 0;
.rs-carousel-action-next {
background-position: right 0;
right: 0;
}

.ting-search-carousel .rs-carousel-disabled .rs-carousel-pagination {
.rs-carousel-disabled .rs-carousel-action-prev,
.rs-carousel-disabled .rs-carousel-action-next {
display: none;
}

.ting-search-carousel .rs-carousel-pagination-link {
display: inline;
}

.ting-search-carousel .rs-carousel-pagination-link a {
padding: 2px 6px;
}

.ting-search-carousel .rs-carousel-pagination-link a:hover {
text-decoration: none;
}

.ting-search-carousel .rs-carousel-pagination-link-active a {
background: #444;
}

/* next & prev actions */
.ting-search-carousel .rs-carousel-disabled .rs-carousel-action-next,
.ting-search-carousel .rs-carousel-disabled .rs-carousel-action-prev {
display: none;
}

.ting-search-carousel .rs-carousel-action-next,
.ting-search-carousel .rs-carousel-action-prev {
background-image: url('../images/buttons.png');
/* Carousel content, mask, title etc.
========================================================================== */
.ajax-loader {
background: transparent url('../images/ajax-loader.gif') no-repeat center center;
left: 50%;
height: 20px;
margin-top: -10px;
margin-left: -110px;
position: absolute;
top: 86px;
height: 35px;
outline: none;
text-indent: -9999px;
width: 35px;
top: 50%;
width: 220px;
}

.ting-search-carousel .rs-carousel-action-prev {
left: -15px;
.rs-carousel-mask,
.rs-carousel-mask ul {
display: inline-block;
vertical-align: top;
}

.ting-search-carousel .rs-carousel-action-next {
right: -15px;
background-position: 0 -35px;
.rs-carousel-mask {
width: 100%;
}

.ting-search-carousel .rs-carousel-action-prev:hover {
background-position: 70px 0;
.rs-carousel-mask ul {
margin: 0;
list-style: none;
}

.ting-search-carousel .rs-carousel-action-next:hover {
background-position: 70px -35px;
.rs-carousel-mask li {
float: left;
width: 100px;
text-align: center;
}

.ting-search-carousel .rs-carousel-action-disabled {
background-position: 35px 0 !important;
.rs-carousel-item-image {
display: block;
}

.ting-search-carousel .rs-carousel-action-prev + .rs-carousel-action-disabled {
background-position: 35px -35px !important;
.rs-carousel-item-image img {
display: block;
margin-left: auto;
margin-right: auto;
}

.ting-search-carousel .rs-carousel-action-disabled {
color: gray;
cursor: default;
}

.ting-search-carousel .rs-carousel-pagination {
display: none;
/* Carousel tabs
========================================================================== */
.rs-carousel-tabs ul {
margin: 0;
position: relative;
text-align: center;
}

.search-carousel-query {
float: left;
.rs-carousel-tabs ul li {
display: table-cell;
vertical-align: top;
text-align: center;
}

.sort-hidden, .search-query-hidden {
display: none;
.rs-carousel-tabs ul li.active a {
position: relative;
}

Binary file added images/arrows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/buttons.png
Binary file not shown.
Loading