Skip to content

Commit

Permalink
Item10059:Item10056:
Browse files Browse the repository at this point in the history
   * adding TagCloudPlugin and ClassificationPlugin to DEPENDENCIES
   * fixing patternskin integration



git-svn-id: http://svn.foswiki.org/trunk/SolrPlugin@10041 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Nov 22, 2010
1 parent 11215cd commit fb84de1
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 33 deletions.
44 changes: 22 additions & 22 deletions data/System/PatternSkinSolrSearchViewTemplate.txt
@@ -1,26 +1,26 @@
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1254418741" format="1.1" reprev="1.2" version="1.2"}%
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1273502467" format="1.1" reprev="2" version="2"}%
%META:TOPICPARENT{name="SolrPlugin"}%
%{<verbatim class="tml">}%
%TMPL:INCLUDE{"SolrSearchBase"}%
%{</verbatim>}%

%{<verbatim class="tml">}%
%TMPL:DEF{"websidebar"}%%TMPL:P{"solr::sidebar"}%%TMPL:END%
%TMPL:DEF{"topicaction"}%%TMPL:END%
%TMPL:DEF{"topicinfo"}%%TMPL:END%
%TMPL:DEF{"breadcrumb:annotation"}%%TMPL:END%
%{</verbatim>}%

%{<verbatim class="tml">}%
%TMPL:DEF{"broadcastmessage"}%%TMPL:P{"solr::search"}%%TMPL:END%
%{</verbatim>}%

%{<verbatim class="tml">}%
%TMPL:DEF{"top:toolbarbuttons"}%%TMPL:END%
%TMPL:DEF{"solr::css"}%<style type="text/css">
#patternSideBarContents h2 {
margin:0px -10px 0.35em;
}
#patternSideBarContents a:link,
#patternSideBarContents a:visited {
color:#4571D0;
}
#patternSideBarContents ul {
margin:0px 0px 1em;
}
.solrSearch .foswikiFormSteps hr {
margin:1em -40px;
}
.patternMetaMenu {
display:none;
}
</style>%TMPL:END%
%TMPL:DEF{"topicaction"}%%TMPL:END%
%{</verbatim>}%

%{<verbatim class="tml">}%
%TMPL:DEF{"styles:default"}%%TMPL:P{"styles:screen"}%%TMPL:P{"styles:print"}%%TMPL:P{"styles:solr"}%%TMPL:END%
%{</verbatim>}%

%{<verbatim class="tml">}%
%TMPL:DEF{"styles:solr"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SolrPlugin/pattern.css' type='text/css' media='all' />%TMPL:END%
%{</verbatim>}%
11 changes: 7 additions & 4 deletions data/System/SolrPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="micha" comment="reprev" date="1290091423" format="1.1" reprev="5" version="5"}%
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1290091423" format="1.1" reprev="5" version="5"}%
%META:TOPICPARENT{name="Plugins"}%
---+ Solr Plugin
%SHORTDESCRIPTION%
Expand Down Expand Up @@ -140,7 +140,7 @@ Note that delta indexing is strongly recommended when one of the settings =Enabl

---++ Usage

---+++ Facetted search interface
---+++ Faceted search interface

---+++ Macros

Expand Down Expand Up @@ -204,7 +204,10 @@ Note that delta indexing is strongly recommended when one of the settings =Enabl
| Version: | %$VERSION% |
| Home: | Foswiki:Extensions/%TOPIC% |
| Support: | Foswiki:Support/%TOPIC% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 22 Nov 2010: | fixes integration with pattern skin |
| 18 Nov 2010: | initial public release |

%META:FILEATTACHMENT{name="SolrPlugin-bin.tar.gz" attachment="SolrPlubin-bin.tar.gz" attr="" comment="" date="1290089830" size="36686861" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="SolrPluginSnap1.png" attachment="SolrPluginSnap1.png" attr="" comment="" date="1290091281" size="93552" user="micha" version="1"}%
%META:FILEATTACHMENT{name="SolrPluginSnap2.png" attachment="SolrPluginSnap2.png" attr="" comment="" date="1290091283" size="158013" user="micha" version="1"}%
%META:FILEATTACHMENT{name="SolrPluginSnap1.png" attachment="SolrPluginSnap1.png" attr="" comment="" date="1290091281" size="93552" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="SolrPluginSnap2.png" attachment="SolrPluginSnap2.png" attr="" comment="" date="1290091283" size="158013" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/SolrPlugin.pm
Expand Up @@ -18,7 +18,7 @@ use Foswiki::Func ();
use Foswiki::Plugins ();

our $VERSION = '$Rev: 20091124 (2009-11-24) $';
our $RELEASE = '1.0';
our $RELEASE = '1.01';
our $SHORTDESCRIPTION = 'Enterprise Search Engine for Foswiki based on [[http://lucene.apache.org/solr/][Solr]]';
our $NO_PREFS_IN_TOPIC = 1;
our $baseWeb;
Expand Down
8 changes: 5 additions & 3 deletions lib/Foswiki/Plugins/SolrPlugin/DEPENDENCIES
@@ -1,7 +1,9 @@
Unicode::MapUTF8,>=1.11,cpan,Required.
JSON::XS (),>=2.231,perl,Required.
AutoTemplatePlugin,>=1.0,perl,Required.
ClassificationPlugin,>=1.0,perl,Optional.
JSON::XS,>=2.231,perl,Required.
LWP::UserAgent,>=5.820,perl,Required.
Moose,>=0.63,perl,Required.
StringifierContrib,>=1.0,perl,Required.
AutoTemplatePlugin,>=1.0,perl,Required.
TagCloudPlugin,>=1.0,perl,Required.
Unicode::MapUTF8,>=1.11,cpan,Required.
XML::Generator,>=1.01,perl,Required.
8 changes: 6 additions & 2 deletions lib/Foswiki/Plugins/SolrPlugin/MANIFEST
Expand Up @@ -19,19 +19,23 @@ lib/WebService/Solr.pm 0644
lib/WebService/Solr/Query.pm 0644
lib/WebService/Solr/Response.pm 0644
pub/System/SolrPlugin/Makefile 0644
pub/System/SolrPlugin/pattern.css 0644
pub/System/SolrPlugin/pattern.css.gz 0644
pub/System/SolrPlugin/pattern.uncompressed.css 0644
pub/System/SolrPlugin/SolrPlugin-bin.tar.gz 0644
pub/System/SolrPlugin/solrplugin.css 0644
pub/System/SolrPlugin/solrplugin.css.gz 0644
pub/System/SolrPlugin/solrplugin.js 0644
pub/System/SolrPlugin/solrplugin.js.gz 0644
pub/System/SolrPlugin/SolrPluginSnap1.png 0644
pub/System/SolrPlugin/SolrPluginSnap2.png 0644
pub/System/SolrPlugin/solrplugin.uncompressed.css 0644
pub/System/SolrPlugin/solrplugin.uncompressed.js 0644
pub/System/SolrPlugin/stripes-bg.png 0644
pub/System/SolrPlugin/toggle-collapse.png 0644
pub/System/SolrPlugin/toggle.png 0644
pub/System/SolrPlugin/toggle-small-collapse.png 0644
pub/System/SolrPlugin/toggle-small.png 0644
pub/System/SolrPlugin/SolrPluginSnap1.png 0644
pub/System/SolrPlugin/SolrPluginSnap2.png 0644
solr/60solr.policy 0644
solr/etc/jetty.xml 0644
solr/etc/webdefault.xml 0644
Expand Down
2 changes: 1 addition & 1 deletion pub/System/SolrPlugin/Makefile
@@ -1,4 +1,4 @@
FOSWIKI_ROOT?=~/foswiki/trunk/core
TARGET= solrplugin.css solrplugin.js
TARGET= solrplugin.css solrplugin.js pattern.css

-include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include
67 changes: 67 additions & 0 deletions pub/System/SolrPlugin/pattern.uncompressed.css
@@ -0,0 +1,67 @@
/* fixes for pattern skin */
.patternTop {
height:27px;
}
#patternTopBarContents {
padding-left:1.5em;
}
#patternSideBarContents {
padding-left:1.5em;
padding-right:0;
}
.patternMetaMenu,
.patternRevInfo {
display:none;
}
.foswikiFormSteps {
border-top:1px solid #ddd;
}
.patternBorder .foswikiFormSteps {
border:0px;
}
.foswikiFormSteps hr {
display:none;
}
.foswikiLayoutTable {
boder-collapse:collapse;
border-spacing:0;
}
.foswikiLayoutTable td {
padding:0px 5px 0px 0px;
}
#patternSideBarContents input[type=radio],
#patternSideBarContents input[type=checkbox],
#patternSideBarContents .foswikiCheckbox {
margin:0px 3px 0px 1px;
}
#patternSideBarContents h2 {
margin-top:0.5em;
margin-bottom:3px;
padding-bottom:2px;
border-bottom:1px solid #ddd;
font-size:120%;
}
#patternSideBarContents a:link,
#patternSideBarContents a:visited {
color:#0066cc;
}
#patternSideBarContents h2 a:link,
#patternSideBarContents h2 a:visited {
color:#339900;
}
#patternSideBarContents h3 {
margin-bottom:3px;
font-size:100%;
color:#000;
}
#patternSideBarContents .solrClear,
#patternSideBarContents .solrClearAll {
margin:5px 0px;
}
#patternSideBarContents .solrFacetContainer {
margin-top:1.5em;
}
.solrPager a:link:hover,
.solrPager a:visited:hover {
text-decoration:none;
}

0 comments on commit fb84de1

Please sign in to comment.