Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
a44840e
Updated make file to point to ding2tal
cableman Sep 3, 2012
3fa8af2
Added formatter settings to enable availability text to link back to …
cableman Sep 3, 2012
2f29bff
Converted availability texts into links back to the entity
cableman Sep 3, 2012
fc96814
Append availability status to links in the javascript
cableman Sep 3, 2012
2bc51aa
Fix un-defined index in formatter settings summary
cableman Sep 4, 2012
df5aa50
Fixed un-initialized error in summary information
cableman Sep 4, 2012
259c9f2
Merge branch 'Added_link_formatter' into development
cableman Sep 6, 2012
aae0b77
Changed blackhold to be fetch from d.o
cableman Oct 18, 2012
3bea2c8
Updated codeing style to match Drupal
cableman Nov 14, 2012
6b4ede7
fixes link to same object bug
Arni Dec 18, 2012
2c27992
Merge pull request #2 from Arni/materialtypes_link_to_same_object_bug
cableman Jan 3, 2013
0665a37
makes unavailable and not-reservable show up as classes as support fo…
wiredloose Jan 31, 2013
60f4f39
overwrite holding data, always marking internet resources as available
wiredloose Jan 31, 2013
00b3b0b
"processed" styling gets same color as "pending" - to no longer hold …
wiredloose Jan 31, 2013
fe4e0e6
Nicer formatting of comments :-)
wiredloose Jan 31, 2013
1e9c030
sets the title tag of links to "available" when it is an internet res…
wiredloose Jan 31, 2013
d04b35b
online types now display status of available + not-reservable, and no…
wiredloose Feb 4, 2013
b673185
Online types are now looked up in Ting settings. This depends on Ting…
wiredloose Feb 5, 2013
8949701
including the availability-status tag inside the clickable link, and …
wiredloose Feb 5, 2013
f990333
restricts ajax calls for holding data only for records that are of th…
wiredloose Feb 5, 2013
7f2c88a
tightening up test for looking up holding data
wiredloose Feb 11, 2013
693baa0
Fixed a bug where javascript would fail when only display online elem…
zorp Mar 11, 2013
da56edc
Some more related to previous commit, fixing bug where js would fail …
zorp Mar 11, 2013
8214e1c
Code style clean up and logic clean up in data sent
cableman Mar 21, 2013
13baa09
Stream-lined the code based on the data available in the current prov…
cableman Mar 21, 2013
a217406
Fixed ac_source for collections
cableman Mar 21, 2013
ab4ff22
Removed not-available-online label
cableman Mar 21, 2013
b9ab8ad
Changed blackhold to virtual field
cableman Mar 22, 2013
b59e3cf
Removed class of "not-reservable" from label on online resources
wiredloose Apr 5, 2013
5ff264b
Making available + not-reservable a label color distinct from available
wiredloose Apr 5, 2013
92327a5
Removed js inserted heading
zorp Apr 19, 2013
7636f26
Added missing "" to match the other make files
cableman Apr 22, 2013
2bbf139
Added "Bibliotekskatalog" to availability types to prepare for the 3.…
cableman Apr 24, 2013
a6985cc
Added the posibility to select which datewell types should have fecth…
cableman Apr 24, 2013
5b6bd26
Added better descriptions and documentation to the holdings admin form
cableman Apr 24, 2013
38af358
Fixed javascript error when no availability is available
cableman Apr 25, 2013
8a48094
Merge branch 'development' into release
cableman Apr 25, 2013
edb5462
Changed makefile to point to ding2 on github
cableman May 6, 2013
0797f5f
Removed reservation form (button) when item is not reservable
cableman Jun 10, 2013
9cdb1a9
Merge remote-tracking branch 'origin' into release
cableman Jun 11, 2013
9193050
Update color codes and changed the way class names are added to reser…
zorp Jun 12, 2013
eff30ea
Added comment about dependency to ting module
cableman Jun 17, 2013
b44b1d0
Provied better comment lines in the JavaScript
cableman Jun 17, 2013
0ca7ae8
Merge branch 'core-pr-3' into development
cableman Jun 17, 2013
c92726f
Merge branch 'development' into release
Jun 17, 2013
e6ddeee
Updated makefile to point to ding2tal
cableman Jun 24, 2013
1e6dc70
Changed makefile to use development branch
cableman Jun 24, 2013
542499f
Merge pull request #6 from ding2tal/core-pr-3
kasperg Jul 3, 2013
2b2a808
Merge branch 'master' into release
cableman Jul 3, 2013
e1837b5
Merge branch 'release' of github.com:ding2tal/ding_availability into …
cableman Jul 3, 2013
dfdbfbb
Updated makefile to point to development branch and ding2tal
cableman Jul 3, 2013
0448ce5
Resolved merge conflict with release branch
cableman Jul 3, 2013
7be956d
Merge remote-tracking branch 'origin' into release
cableman Jul 3, 2013
2f58b76
Updated coding style
cableman Sep 17, 2013
5b4c434
Fixed url encoding of online links
cableman Sep 17, 2013
937b10d
Merge remote-tracking branch 'origin' into release
cableman Sep 20, 2013
a73594f
Fixed link in typelink to include a slash
Oct 9, 2013
d1ee051
Changed what not-reservalbe is to not-available and not-reservable
cableman Oct 17, 2013
1448b9b
Added total counts above the holdings tables
cableman Oct 20, 2013
7b9e821
Ensured that x of y in holdings is not displayed
cableman Oct 22, 2013
9be78e6
Move html creation from ding_providers to ding_availability.
runephilosof Oct 23, 2013
d0acd51
Merge pull request #3 from odensecentralbibliotek/html-gen
cableman Oct 30, 2013
fd8615a
Updated the holdings information to match new HTML tables
cableman Oct 30, 2013
481dac7
Merge branch 'html_tables' into development
cableman Oct 30, 2013
81d64e3
Merge remote-tracking branch 'origin' into release
cableman Nov 4, 2013
3eca747
Updated makefile to point to tag 7.x-1.0-beta2
cableman Nov 4, 2013
ad6355a
Renamed ding_availability theme function to ding_holdings
cableman Nov 11, 2013
b1b3fc5
Added new availability field formatter and matching theme functions
cableman Nov 11, 2013
a77af4e
Added colors to availability links
cableman Nov 11, 2013
dc1d2e3
Fixed pending class on availbility on search result page
cableman Nov 12, 2013
56a83b2
Removed old availability formatter
cableman Nov 12, 2013
6e13318
Cleaned up availability javascript
cableman Nov 12, 2013
2743084
Updated availability to handle the new formatter and clean out the ol…
cableman Nov 12, 2013
8b6cd17
Fixed link to collction if more than one material is behind availabil…
cableman Nov 12, 2013
7ff8060
Fixed javascript in availability to match both formatters
cableman Nov 12, 2013
c2254b2
Merge remote-tracking branch 'origin' into release
cableman Nov 25, 2013
de40d07
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
ccc1002
Fixed javascript to work in IE9 and older versions
cableman Nov 27, 2013
c26bd7b
Updated default availbility javascript so it will not run again after…
cableman Dec 3, 2013
27aa6bb
Updated library material types to use configuration variable
cableman Dec 5, 2013
fb20b3e
Ensured that ac.source match library material type (strtolower)
cableman Dec 5, 2013
1ae6999
Added loader to holdings information formatter
cableman Dec 5, 2013
c453b81
Merge remote-tracking branch 'origin' into release
cableman Dec 12, 2013
8c4ae0f
Updated makefile to point to tag 7.x-1.0-beta4
cableman Dec 12, 2013
3dea265
Updated makefile to point to tag 7.x-1.0-beta5
cableman Dec 18, 2013
b3a12d1
Updated default availability types to get holdings for
cableman Dec 19, 2013
446c1b0
Setting availability to online for material with online url
cableman Dec 20, 2013
47e55d0
Merge remote-tracking branch 'origin' into release
cableman Dec 20, 2013
03bb8ff
Updated makefile to point to tag 7.x-1.0-rc1
cableman Dec 20, 2013
f831d27
Updated makefile to point to tag 7.x-1.0-rc2
cableman Jan 8, 2014
c471beb
Updated makefile to point to tag 7.x-1.0-rc3
cableman Jan 20, 2014
2a477c5
Updated makefile to point to ding2 master branches
cableman Feb 3, 2014
53298ed
Updated the javascript to handle the new reservation buttons
cableman Feb 25, 2014
73fd36b
Fixed index error in availability render call
cableman Mar 19, 2014
9de0f3c
Added missing new line
cableman Apr 30, 2014
9144e3c
Added missing new line
cableman Apr 30, 2014
40df3da
Renamed home variable to available
cableman Apr 30, 2014
3ea757a
Moved ":" outside label in JavaScript translation string
cableman Apr 30, 2014
7e02725
Moved ":" outside label in JavaScript translation string
cableman Apr 30, 2014
4e3928b
Updated virtual field to version 1.2
cableman May 6, 2014
dc5aba6
Issue #373 cableman: Fixed loading of relations only when needed
cableman May 15, 2014
1cc188c
Merge pull request #7 from ding2tal/core-pr-4
kasperg May 22, 2014
021f2a5
DDBEASY-45 - Availability fixes.
guddo Aug 22, 2014
a6632e3
Merge pull request #5 from guddo/DDBEASY-45
cableman Aug 25, 2014
6206c31
Issue #453 by cableman: Removed load of both javascripts in label only
cableman Aug 25, 2014
961c608
Issue #453 by cableman: Filter reservable sources
cableman Aug 25, 2014
0c2976f
Merge branch 'master' into development
cableman Oct 6, 2014
9835e1d
Updated make file to point to development branch
cableman Oct 6, 2014
6c47371
Updated make file to point to development branch
cableman Oct 6, 2014
c2d2dd3
Updated make file to point to master branch
cableman Oct 6, 2014
b34100c
Merge pull request #8 from ding2tal/core-pr-5
kasperg Oct 21, 2014
20ebd82
issue #1014 by JrgenGNielsen: modify ding_availability_update_availab…
JrgenGNielsen Mar 4, 2015
962a954
Merge pull request #14 from JrgenGNielsen/feature/bug1014_bookmark_re…
kasperg Apr 21, 2015
9dcb42f
Issue #618 by guddo: Refactoring availability logic.
guddo Apr 21, 2015
93f61b6
Merge pull request #16 from guddo/618-refactoring-availability-logic
kasperg Apr 23, 2015
b92188a
issue #1014 by JrgenGNielsen: Fix merge conflict with issue #618
JrgenGNielsen Jun 1, 2015
3cd6590
Merge pull request #17 from JrgenGNielsen/feature/bug1014_bookmark_re…
cableman Jun 11, 2015
793c2b1
issue #336 by JrgenGNielsen: Show "in acquisition" info
JrgenGNielsen Jun 15, 2015
6c44230
issue #336 by JrgenGNielsen: Remove whitespace
JrgenGNielsen Jul 9, 2015
234d648
Rename variable, update docblock, and fix key
JrgenGNielsen Jul 9, 2015
eedeffb
Check if ordered_count is set
JrgenGNielsen Jul 9, 2015
174452a
Merge pull request #18 from JrgenGNielsen/feature/bug336-show_inAcqui…
kasperg Jul 9, 2015
1f36db0
issue #1334 by JrgenGNielsen: Update add inAcquisition to totals
JrgenGNielsen Aug 14, 2015
79c34a9
Merge pull request #19 from JrgenGNielsen/feature/1338-show_inAcquisi…
cableman Sep 14, 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
22 changes: 9 additions & 13 deletions css/ding_availability.css
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@

.pending {
color: #696a69;
}

/* Not available or reservable */
/* Note: This applies to online resources as well. However, it's possible to style these, based on material type */
.availability.pending,
.availability.processed {
color: #ed1e88;
}

.availability.available {
color: #0072bc;
color: #959595; /* Grey */
}

.availability.reservable {
color: #ea9123;
color: #f0cb28; /* Yellow */
}

/* Available and reservable */
.availability.available,
.availability.available.reservable {
color: #4c9f45;
color: #528c10; /* Green */
}

/* Available, but not reservable */
.availability.available.not-reservable {
color: #a32e10; /* Red */
}
12 changes: 5 additions & 7 deletions css/ding_availability_legend.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,21 @@
}

.availability-legend-item.available img {
background-color: #4c9f45;
background-color: #528c10; /* Green */
}

.availability-legend-item.on-loan img {
background-color: #ea9123;
background-color: #f0cb28; /* Yellow */
}

.availability-legend-item.unavailable img {
background-color: #ED1E88;
background-color: #a32e10; /* Red */
}

.availability-legend-item.unavailable.netdokument img {
background-color: #2e2e2e;
background-color: #a32e10; /* Red */
}

.availability-legend-item.unreservable img {
background-color: #0072bc;
background-color: #a32e10; /* Red */
}


50 changes: 50 additions & 0 deletions ding_availability.admin.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php
/**
* @file
* The administration interface to select the data well types that should have
* holdings information.
*/

/**
* Administration for to select which data well types that should have holdings
* information displayed.
*/
function ding_availability_admin_holdings_settings($form_state) {
$form = array();

// Add button to update the types from the data well. Which requires us to
// load the administration file for the ting module to get the information.
form_load_include($form_state, 'inc', 'ting', 'ting.admin');
$form['update'] = array(
'#type' => 'fieldset',
'#title' => t('Update from datawell'),
'#description' => t('Update the lists of known types and sources by asking the datawell for all types and sorces.'),
);

$form['update']['update'] = array(
'#type' => 'submit',
'#value' => t('Update'),
'#submit' => array('ting_admin_reservable_settings_update'),
);

// Get available types.
$types = variable_get('ting_well_types', array());

$form['ding_availability_holdings'] = array(
'#type' => 'fieldset',
'#title' => t('Holdings information'),
'#tree' => FALSE,
'#description' => t("Which ting object types should display provider holdings information in the holding field e.g. on the ting object view"),
);

$form['ding_availability_holdings']['ding_availability_holdings_types'] = array(
'#type' => 'checkboxes',
'#title' => t('Types'),
'#options' => drupal_map_assoc(array_keys($types)),
'#default_value' => variable_get('ding_availability_holdings_types', _ding_availability_holdings_default_types()),
);
// Save us the trouble of running array_filter.
$form['array_filter'] = array('#type' => 'value', '#value' => TRUE);

return system_settings_form($form);
}
Loading