Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
7f92d2c
Updated coding style
cableman Apr 22, 2013
7e072b5
Added make file
cableman Apr 22, 2013
f173754
Added ctools patch to fix filter_xss_admin call
cableman Apr 29, 2013
5f1ff05
Changed makefile to point to ding2 on github
cableman May 6, 2013
fd86f31
Removed comment line from make file
cableman Jun 4, 2013
dbe4a98
Fixed newlines and spaces
cableman Jun 4, 2013
b817884
Merge branch 'core-pr-3' into release
cableman Jun 4, 2013
4450daf
Updated makefile to point to ding2tal
cableman Jun 4, 2013
e9a6cc5
Merge branch 'release' into development
cableman Jun 4, 2013
136e225
Merge remote-tracking branch 'origin' into release
cableman Jun 4, 2013
cc8d28f
Merge branch 'release' into development
cableman Jun 5, 2013
f8482a5
Merge remote-tracking branch 'origin' into release
cableman Jun 10, 2013
2392bbd
Fix bug with show more link being inserted as span tag when clicking …
zorp Jun 12, 2013
6543e11
Changed makefile to use development branch
cableman Jun 24, 2013
92f5adf
Merge pull request #3 from ding2tal/core-pr-3
kasperg Jul 3, 2013
de0eead
Merge branch 'master' into release
cableman Jul 3, 2013
92c387b
Updated makefile to point to development branch and ding2tal
cableman Jul 3, 2013
60252e7
Merge branch 'release' into development
cableman Jul 3, 2013
c7ce141
Merge remote-tracking branch 'origin' into release
cableman Jul 3, 2013
74f0c22
Case 2844 - Added sorting check.
May 28, 2013
db27b8b
Merge remote-tracking branch 'origin' into release
cableman Jul 18, 2013
2f5fea2
Changed mainElement to use facetElement, and now JS prepended.
Oct 30, 2013
18b1838
Merge remote-tracking branch 'origin' into release
cableman Nov 4, 2013
46d538f
Updated makefile to point to tag 7.x-1.0-beta2
cableman Nov 4, 2013
3a283da
Added new loading overlay
cableman Nov 6, 2013
b844946
Merge remote-tracking branch 'origin' into release
cableman Nov 25, 2013
a438704
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
3d96ba2
Fixed overlay on facet select and clean up code
cableman Nov 27, 2013
ee4bd86
Changed the javascript to use the search overlay defined in ting_search
cableman Dec 10, 2013
33dc524
Merge remote-tracking branch 'origin' into release
cableman Dec 12, 2013
e2f58cb
Updated makefile to point to tag 7.x-1.0-beta4
cableman Dec 12, 2013
5f8c330
Fixed number_of_terms issue to show less facets
Dec 17, 2013
d18c4e5
Merge remote-tracking branch 'origin' into release
cableman Dec 18, 2013
aeb4a9d
Updated makefile to point to tag 7.x-1.0-beta5
cableman Dec 18, 2013
745f476
Removed debug statement from JS
cableman Dec 18, 2013
fe792a4
Fixed facet browser show/hide groups
cableman Dec 19, 2013
21e982e
Merge remote-tracking branch 'origin' into release
cableman Dec 20, 2013
013a5a6
Updated makefile to point to tag 7.x-1.0-rc1
cableman Dec 20, 2013
3d2a7db
Updated makefile to point to tag 7.x-1.0-rc2
cableman Jan 8, 2014
6de1b38
Fixed default value for number of facets shown
cableman Jan 8, 2014
481f598
Updated makefile to point to tag 7.x-1.0-rc3
cableman Jan 20, 2014
7ed7b6a
Updated makefile to point to ding2 master branches
cableman Feb 3, 2014
122811a
Updated contrib module ctools
cableman Feb 18, 2014
0b01bc2
Removed ctools patch from make file
cableman Feb 18, 2014
c79fd32
Ensured that all facets are displayed as default
cableman Mar 19, 2014
1b2d1ba
Ensured that t function is available in install file
cableman Mar 25, 2014
768f5aa
Set default facets during installation
cableman Mar 25, 2014
52fc1be
Refactored function names to match code guidelines
cableman May 1, 2014
2ce2ab7
Refactored function names to match code guidelines
cableman May 1, 2014
666be79
Updated comments in JS about wrapper classes
cableman May 28, 2014
37d3b96
Updated comments in JS about wrapper classes
cableman May 28, 2014
544241c
Removed the use of ID's from the javascript
cableman May 28, 2014
011fdab
Removed the use of ID's from the javascript
cableman May 28, 2014
bbe0cb2
Merge pull request #4 from ding2tal/core-pr-4
kasperg May 28, 2014
5859a15
Resolved merge conflict
cableman Oct 6, 2014
45bcdaf
Updated make file to point to development branch
cableman Oct 6, 2014
b77fe31
Updated make file to point to master branch
cableman Oct 6, 2014
59b9514
Merge pull request #5 from ding2tal/core-pr-5
kasperg Oct 21, 2014
aeeab5f
Resovled merge conflict in facet form
cableman Nov 3, 2014
1216190
Merge pull request #6 from ding2tal/core-pr-6
kasperg Dec 17, 2014
4dfa135
Issue #137 by cableman: Updated ctools in makefile to fix missing arg…
cableman Jan 15, 2015
d0cfdbf
Merge pull request #7 from ding2tal/feature/issue-137-ctools
kasperg Jan 19, 2015
2c5692e
case 4312 - Dont make overlay appear if new window.
guddo Jul 31, 2014
67828eb
case 4312 - Dont make overlay appear if new window.
guddo Sep 23, 2014
e8f7c85
Issue #1275 by JrgenGNielsen: urledcode facet value part
JrgenGNielsen Aug 17, 2015
b4a9ec5
Security: Updated ctools to version 1.9
cableman Aug 20, 2015
0658900
Merge pull request #15 from aakbcms/feature/ctools_update
kasperg Aug 20, 2015
48c6b30
Merge pull request #14 from JrgenGNielsen/feature/1275-urlencoding_is…
cableman Oct 28, 2015
52254d7
Merge pull request #12 from easyddb/DDBEASY-97
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
16 changes: 0 additions & 16 deletions css/facetbrowser.css

This file was deleted.

10 changes: 5 additions & 5 deletions ding_facetbrowser.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ function ding_facetbrowser_settings($form_state) {
form_load_include($form_state, 'inc', 'ding_facetbrowser', 'ding_facetbrowser.admin');
$form = array();
$facets = variable_get('ding_facetbrowser_facets', array());

$form['description'] = array(
'#markup' => '<p>' . t('Configure facets shown in the facetbrowser. Facet names can be found at <a href="http://oss.dbc.dk/wiki/bin/view/Databroend/OpenSearchDocIndexes">DBC wiki</a> and is usually named <em>facet.something</em>.') . '</p>',
);

$showcount = variable_get('ding_facetbrowser_showcount', count($facets));
$showcount = variable_get('ding_facetbrowser_showcount', 5);
$form['ding_facetbrowser_showcount'] = array(
'#type' => 'select',
'#title' => t('Visible facets amount'),
Expand All @@ -36,7 +36,7 @@ function ding_facetbrowser_settings($form_state) {
'#options' => drupal_map_assoc(range(1, 15)),
'#default_value' => $number_of_terms,
);

$form['ding_facetbrowser_facets'] = array(
'#tree' => TRUE,
'#weight' => -20,
Expand Down Expand Up @@ -123,7 +123,6 @@ function ding_facetbrowser_settings($form_state) {
);
$i++;


$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
Expand Down Expand Up @@ -179,6 +178,7 @@ function theme_ding_facetbrowser_settings($variables) {
$output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'facets')));
$output .= drupal_render($form['actions']);
$output = drupal_render_children($form) . $output;

return $output;
}

Expand Down Expand Up @@ -206,4 +206,4 @@ function ding_facetbrowser_delete_facet_submit($form, &$form_state) {
variable_set('ding_facetbrowser_facets', $facets);
drupal_set_message(t('@facet deleted.', array('@facet' => $form_state['values']['facet_id'])));
$form_state['redirect'] = 'admin/config/ting/facets';
}
}
2 changes: 1 addition & 1 deletion ding_facetbrowser.info
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ core = 7.x
package = Ding!
files[] = ding_facetbrowser.module
files[] = ding_facetbrowser.test

dependencies[] = ting_search
66 changes: 62 additions & 4 deletions ding_facetbrowser.install
Original file line number Diff line number Diff line change
@@ -1,20 +1,78 @@
<?php
/**
* @file
* Handles requirements hook for the module.
*/

/**
* Implement hook_requirements():
* Implements hook_requirements().
*/
function ding_facetbrowser_requirements($phase) {
$requirements = array();
$t = get_t();
if ($phase == 'runtime') {
$requirements['ding_facetbrowser'] = array(
'title' => t('Ding facetbrowser'),
'value' => t('One or more facetgroups have been translated.'),
'title' => $t('Ding facetbrowser'),
'value' => $t('One or more facetgroups have been translated.'),
);
if (variable_get('ding_facetbrowser_facets', FALSE) == FALSE) {
$requirements['ding_facetbrowser']['value'] = t('No facetgroups have been translated. Go to <a href="!link">Settings</a>.', array('!link' => '/admin/config/ting/facets'));
$requirements['ding_facetbrowser']['value'] = $t('No facetgroups have been translated. Go to <a href="!link">Settings</a>.', array('!link' => '/admin/config/ting/facets'));
$requirements['ding_facetbrowser']['severity'] = REQUIREMENT_ERROR;
}
}
return $requirements;
}

/**
* Implements hook_install().
*
* Set default facets during installation.
*/
function ding_facetbrowser_install() {
$facets = array(
0 => array(
'name' => 'facet.type',
'title' => 'Materialetype',
'sorting' => 'default',
'weight' => '-10',
),
1 => array(
'name' => 'facet.creator',
'title' => 'Forfatter',
'sorting' => 'default',
'weight' => '-9',
),
2 => array(
'name' => 'facet.subject',
'title' => 'Emne',
'sorting' => 'default',
'weight' => '-8',
),
3 => array(
'name' => 'facet.language',
'title' => 'Sprog',
'sorting' => 'default',
'weight' => '-7',
),
4 => array(
'name' => 'facet.category',
'title' => 'Målgruppe',
'sorting' => 'default',
'weight' => '-6',
),
5 => array(
'name' => 'facet.date',
'title' => 'Årstal',
'sorting' => 'numeric_reverse',
'weight' => '-5',
),
6 => array(
'name' => 'facet.acSource',
'title' => 'Kilde',
'sorting' => 'default',
'weight' => '-4',
),
);

variable_set('ding_facetbrowser_facets', $facets);
}
12 changes: 12 additions & 0 deletions ding_facetbrowser.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
core = 7.x
api = 2

; Projects
projects[ctools][subdir] = "contrib"
projects[ctools][version] = "1.9"

projects[ting][type] = "module"
projects[ting][download][type] = "git"
projects[ting][download][url] = "git@github.com:ding2/ting.git"
projects[ting][download][branch] = "master"

Loading