diff --git a/CHANGES.md b/CHANGES.md index 3144129598..0269893ee1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -129,6 +129,24 @@ extension point are removed, so a deployment that configured its own `AtomHandlerFactory` (for example, for custom authentication) no longer has that handler. AtomPub clients see no change. +- **Icons and images without a compatible license are gone.** The Gaurav theme + no longer ships Font Awesome 3, and the Gaurav and Fauxcoly themes, the + admin pages and the Emoticons plugin no longer use Silk icons or images of + unknown origin. Bootstrap Icons replace them, drawn inline so they look the + same in a customized copy of a theme. The Emoticons plugin now turns `:-)` + into a Unicode emoji instead of an image from `/images/smileys/`, which is + removed along with `/images/editor/` and most Silk icons in `/images/`. + The standard feed icon, the RSS, Atom and OPML badges, the OpenID logo and + the permalink and launch-link icons in `/images/` are gone too, with feed + links now drawn as a Bootstrap Icons feed icon. The unused admin colour + themes under `/roller-ui/theme/` and three unused images in + `/roller-ui/images/` are removed. + Custom templates that link to those files, or to `font-awesome.min.css` or + the theme icons other than `asf-logo.png`, show broken images until they + are updated. Weblogs already using a customized copy keep their own copies + of the old files. Search term highlighting in both themes now uses a new + `js/search-highlight.js`; customized search pages that load `searchhi.js` + keep working only while their copy of that file remains. ### Build and packaging diff --git a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java index 2b4acd29c7..e84bbb02f7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java @@ -18,155 +18,115 @@ package org.apache.roller.weblogger.business.plugins.entry; -import java.util.Enumeration; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.text.StringEscapeUtils; +import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.WebloggerException; -import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; +import org.apache.roller.weblogger.pojos.WeblogEntry; /** - * Converts ascii emoticons into HTML image tags. + * Converts ASCII emoticons into Unicode emoji. + * + *

Each emoticon listed in smileys.properties becomes + * <span class="smiley" title=":-)">&#x1F642;</span>, + * so no image files are needed and the emoji scales with the text around it. */ public class SmileysPlugin implements WeblogEntryPlugin { - + private static final Log log = LogFactory.getLog(SmileysPlugin.class); - // public for tests - public static Pattern[] smileyPatterns = new Pattern[0]; - static String[] imageTags = new String[0]; - private static final Properties smileyDefs = new Properties(); - - private final String name = "Emoticons"; - private final String description = "Change ASCII emoticons to graphics. " + - ":-) becomes "; - - + private static final String NAME = "Emoticons"; + private static final String DESCRIPTION = + "Change ASCII emoticons to emoji. :-) becomes a smiling face."; + + /** Matches any of the emoticons, longest first. */ + private static final Pattern SMILEY_PATTERN; + + /** The markup that replaces each emoticon. */ + private static final Map REPLACEMENTS; + static { - try { - smileyDefs.load(SmileysPlugin.class.getResourceAsStream("smileys.properties")); - } catch (Exception e) { + Properties smileyDefs = new Properties(); + try (InputStream in = SmileysPlugin.class.getResourceAsStream("smileys.properties")) { + if (in == null) { + throw new IOException("smileys.properties is not on the classpath"); + } + smileyDefs.load(in); + } catch (IOException e) { log.error("Unable to load smileys.properties", e); } + + Map replacements = new HashMap<>(); + for (String smiley : smileyDefs.stringPropertyNames()) { + String codePoint = smileyDefs.getProperty(smiley).trim(); + String title = StringEscapeUtils.escapeHtml4(smiley); + replacements.put(smiley, "&#x" + + codePoint + ";"); + } + REPLACEMENTS = Collections.unmodifiableMap(replacements); + + // One pass with the longest emoticons tried first, so that ":))" is + // not read as ":)" followed by ")", and markup that has already been + // inserted is never matched again + List smileys = new ArrayList<>(replacements.keySet()); + smileys.sort((a, b) -> b.length() != a.length() + ? b.length() - a.length() : a.compareTo(b)); + SMILEY_PATTERN = smileys.isEmpty() ? null : Pattern.compile( + smileys.stream().map(Pattern::quote).collect(Collectors.joining("|"))); } - + public SmileysPlugin() { log.debug("SmileysPlugin instantiated."); } - - + + @Override public String getName() { - return name; + return NAME; } - - + + @Override public String getDescription() { - return StringEscapeUtils.escapeEcmaScript(description); + return StringEscapeUtils.escapeEcmaScript(DESCRIPTION); } - - - /* - * Convert the SmileyDefs into RegEx patterns and img tags for - * later use. Need an HttpServletRequest though so that we can - * get the ServletContext Path. But only do it once. - */ + + @Override - public synchronized void init(Weblog website) throws WebloggerException { - // don't do this work if Smileys already loaded - if (SmileysPlugin.smileyPatterns.length < 1) { - String baseURL = WebloggerRuntimeConfig.getAbsoluteContextURL(); - - Pattern[] tempP = new Pattern[SmileysPlugin.smileyDefs.size()]; - String[] tempS = new String[SmileysPlugin.smileyDefs.size()]; - log.debug("# smileys: " + smileyDefs.size()); - int count = 0; - Enumeration enum1 = SmileysPlugin.smileyDefs.propertyNames(); - while(enum1.hasMoreElements()) { - String smiley = (String)enum1.nextElement(); - String smileyAlt = htmlEscape(smiley); - tempP[count] = Pattern.compile(regexEscape(smiley)); - tempS[count] = "\"""; - log.debug(smiley + "=" + tempS[count]); - count++; - } - SmileysPlugin.smileyPatterns = tempP; - SmileysPlugin.imageTags = tempS; - } + public void init(Weblog website) throws WebloggerException { + // nothing to do, the emoticons are loaded once when the class loads } - - + + /** - * Find occurences of ascii emoticons and turn them into HTML image pointers. + * Find occurrences of ASCII emoticons and turn them into emoji. */ @Override public String render(WeblogEntry entry, String text) { - Matcher matcher; - for (int i=0; i') { - buf.append(">"); - } else if (chars[i] == '<') { - buf.append("<"); - } else { - buf.append(chars[i]); - } - } - return buf.toString(); - } - - /** - * Some characters have to escaped with a backslash before - * being compiled into a Regular Expression. - * - * @param smiley - * @return - */ - private static final char[] escape_regex = new char[] - {'-', '(', ')', '\\', '|', ':', '^', '$', '*', '+', '?', - '{', '}', '!', '=', '<', '>', '&', '[', ']' }; - - private String regexEscape(String smiley) { - char[] chars = smiley.toCharArray(); - StringBuilder buf = new StringBuilder(); - for (int i=0; i=whisper.gif -\:">=blush.gif -\:o)=clown.gif -\:-/=confused.gif -\:((=cry.gif ->\:)=devil.gif -\#-o=doh.gif -\:-*=kiss.gif -\:))=laugh.gif -\:x=love.gif -8-|=rolleyes.gif -\:(\:-$=shush.gif -\:-&=sick.gif -8-}=silly.gif -I-)=sleep.gif -\:->=smug.gif \ No newline at end of file +# Each ASCII emoticon maps to the Unicode code point, in hexadecimal, of the +# emoji that SmileysPlugin puts in its place. + +\:-)=1F642 +\:)=1F642 +;-)=1F609 +;)=1F609 +\:-(=1F641 +\:(=1F641 +\:-0=1F62E +8-)=1F60E +\:-D=1F600 +\\-o=1F971 +\:-P=1F61B +O\:-)=1F607 +\:-||=1F620 +%-)=1F974 +/\:)=1F928 +\:-S=1F61F +\:|=1F610 +;;)=1F60F +\:-B=1F913 +\=;=270B +[-(=1F612 +(\:|=1F61E +\=P~=1F924 +\:-?=1F914 +\=D>=1F92D +\:">=1F60A +\:o)=1F921 +\:-/=1F615 +\:((=1F622 +>\:)=1F608 +\#-o=1F926 +\:-*=1F618 +\:))=1F606 +\:x=1F60D +8-|=1F644 +\:(\:-$=1F92B +\:-&=1F922 +8-}=1F92A +I-)=1F634 +\:->=1F60C diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp index 6c461abd92..970e15beef 100644 --- a/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp @@ -120,7 +120,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp index e93b76ded7..d1e782b27f 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp @@ -77,7 +77,7 @@ - + diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp index bfb50b7c4f..b02a968e3d 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp @@ -51,10 +51,10 @@ - icon + - icon + diff --git a/app/src/main/webapp/WEB-INF/tags/help.tag b/app/src/main/webapp/WEB-INF/tags/help.tag index 1ba4558bec..ff7431a8e3 100644 --- a/app/src/main/webapp/WEB-INF/tags/help.tag +++ b/app/src/main/webapp/WEB-INF/tags/help.tag @@ -1,6 +1,5 @@ <%@tag%> <%@ attribute name="key" required="true" rtexprvalue="true" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> -<%@ taglib uri="/struts-tags" prefix="s" %> -icon + diff --git a/app/src/main/webapp/WEB-INF/velocity/weblog.vm b/app/src/main/webapp/WEB-INF/velocity/weblog.vm index 58da142ae1..a05f8979f3 100644 --- a/app/src/main/webapp/WEB-INF/velocity/weblog.vm +++ b/app/src/main/webapp/WEB-INF/velocity/weblog.vm @@ -490,9 +490,7 @@ Show bookmarks as a HTML ul list. src="$utils.escapeHTML($bookmark.image)" class="rBookmark" /> #else #if($utils.isNotEmpty( $bookmark.FeedUrl)) - $text.get( + #end $!utils.escapeHTML($bookmarkName) #end diff --git a/app/src/main/webapp/images/add.png b/app/src/main/webapp/images/add.png deleted file mode 100644 index 323edb0294..0000000000 Binary files a/app/src/main/webapp/images/add.png and /dev/null differ diff --git a/app/src/main/webapp/images/atombadge.jpeg b/app/src/main/webapp/images/atombadge.jpeg deleted file mode 100644 index 94520e6751..0000000000 Binary files a/app/src/main/webapp/images/atombadge.jpeg and /dev/null differ diff --git a/app/src/main/webapp/images/calendar.png b/app/src/main/webapp/images/calendar.png deleted file mode 100644 index c245f1b421..0000000000 Binary files a/app/src/main/webapp/images/calendar.png and /dev/null differ diff --git a/app/src/main/webapp/images/cog.png b/app/src/main/webapp/images/cog.png deleted file mode 100644 index dba86c91c4..0000000000 Binary files a/app/src/main/webapp/images/cog.png and /dev/null differ diff --git a/app/src/main/webapp/images/comment.png b/app/src/main/webapp/images/comment.png deleted file mode 100644 index 066f1a0575..0000000000 Binary files a/app/src/main/webapp/images/comment.png and /dev/null differ diff --git a/app/src/main/webapp/images/control_play.png b/app/src/main/webapp/images/control_play.png deleted file mode 100755 index 67d22ae341..0000000000 Binary files a/app/src/main/webapp/images/control_play.png and /dev/null differ diff --git a/app/src/main/webapp/images/delete.png b/app/src/main/webapp/images/delete.png deleted file mode 100644 index 3ba9615b43..0000000000 Binary files a/app/src/main/webapp/images/delete.png and /dev/null differ diff --git a/app/src/main/webapp/images/editor/bgcol.gif b/app/src/main/webapp/images/editor/bgcol.gif deleted file mode 100644 index 4a6727dcb3..0000000000 Binary files a/app/src/main/webapp/images/editor/bgcol.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/bold.gif b/app/src/main/webapp/images/editor/bold.gif deleted file mode 100644 index 539a6ce3c1..0000000000 Binary files a/app/src/main/webapp/images/editor/bold.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/bullist.gif b/app/src/main/webapp/images/editor/bullist.gif deleted file mode 100644 index 6b7364d67f..0000000000 Binary files a/app/src/main/webapp/images/editor/bullist.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/center.gif b/app/src/main/webapp/images/editor/center.gif deleted file mode 100644 index edacd63776..0000000000 Binary files a/app/src/main/webapp/images/editor/center.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/forecol.gif b/app/src/main/webapp/images/editor/forecol.gif deleted file mode 100644 index c1b81e0370..0000000000 Binary files a/app/src/main/webapp/images/editor/forecol.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/image.gif b/app/src/main/webapp/images/editor/image.gif deleted file mode 100644 index c15e930a7a..0000000000 Binary files a/app/src/main/webapp/images/editor/image.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/italic.gif b/app/src/main/webapp/images/editor/italic.gif deleted file mode 100644 index 4c75589007..0000000000 Binary files a/app/src/main/webapp/images/editor/italic.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/justify.gif b/app/src/main/webapp/images/editor/justify.gif deleted file mode 100644 index f8ba71fd1b..0000000000 Binary files a/app/src/main/webapp/images/editor/justify.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/left.gif b/app/src/main/webapp/images/editor/left.gif deleted file mode 100644 index a5f697531c..0000000000 Binary files a/app/src/main/webapp/images/editor/left.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/link.gif b/app/src/main/webapp/images/editor/link.gif deleted file mode 100644 index 6827ab0721..0000000000 Binary files a/app/src/main/webapp/images/editor/link.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/mode.gif b/app/src/main/webapp/images/editor/mode.gif deleted file mode 100644 index 2c23dcab3b..0000000000 Binary files a/app/src/main/webapp/images/editor/mode.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/ordlist.gif b/app/src/main/webapp/images/editor/ordlist.gif deleted file mode 100644 index e2c0940a7a..0000000000 Binary files a/app/src/main/webapp/images/editor/ordlist.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/right.gif b/app/src/main/webapp/images/editor/right.gif deleted file mode 100644 index de64d5c436..0000000000 Binary files a/app/src/main/webapp/images/editor/right.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/rule.gif b/app/src/main/webapp/images/editor/rule.gif deleted file mode 100644 index ac700f265a..0000000000 Binary files a/app/src/main/webapp/images/editor/rule.gif and /dev/null differ diff --git a/app/src/main/webapp/images/editor/underline.gif b/app/src/main/webapp/images/editor/underline.gif deleted file mode 100644 index 869ee7d79f..0000000000 Binary files a/app/src/main/webapp/images/editor/underline.gif and /dev/null differ diff --git a/app/src/main/webapp/images/email_edit.png b/app/src/main/webapp/images/email_edit.png deleted file mode 100644 index f141fd876c..0000000000 Binary files a/app/src/main/webapp/images/email_edit.png and /dev/null differ diff --git a/app/src/main/webapp/images/feed-icon-12x12.gif b/app/src/main/webapp/images/feed-icon-12x12.gif deleted file mode 100644 index c9c839287e..0000000000 Binary files a/app/src/main/webapp/images/feed-icon-12x12.gif and /dev/null differ diff --git a/app/src/main/webapp/images/folder.png b/app/src/main/webapp/images/folder.png deleted file mode 100644 index 51936100b0..0000000000 Binary files a/app/src/main/webapp/images/folder.png and /dev/null differ diff --git a/app/src/main/webapp/images/folder_add.png b/app/src/main/webapp/images/folder_add.png deleted file mode 100644 index 0e129ab809..0000000000 Binary files a/app/src/main/webapp/images/folder_add.png and /dev/null differ diff --git a/app/src/main/webapp/images/help.png b/app/src/main/webapp/images/help.png deleted file mode 100644 index 64e7412431..0000000000 Binary files a/app/src/main/webapp/images/help.png and /dev/null differ diff --git a/app/src/main/webapp/images/image.png b/app/src/main/webapp/images/image.png deleted file mode 100644 index 3845173d0f..0000000000 Binary files a/app/src/main/webapp/images/image.png and /dev/null differ diff --git a/app/src/main/webapp/images/image_add.png b/app/src/main/webapp/images/image_add.png deleted file mode 100644 index fc5d6139e9..0000000000 Binary files a/app/src/main/webapp/images/image_add.png and /dev/null differ diff --git a/app/src/main/webapp/images/launch-link.png b/app/src/main/webapp/images/launch-link.png deleted file mode 100644 index a86314950a..0000000000 Binary files a/app/src/main/webapp/images/launch-link.png and /dev/null differ diff --git a/app/src/main/webapp/images/link.png b/app/src/main/webapp/images/link.png deleted file mode 100644 index 453f0d3f12..0000000000 Binary files a/app/src/main/webapp/images/link.png and /dev/null differ diff --git a/app/src/main/webapp/images/link_add.png b/app/src/main/webapp/images/link_add.png deleted file mode 100644 index 60bbbea22d..0000000000 Binary files a/app/src/main/webapp/images/link_add.png and /dev/null differ diff --git a/app/src/main/webapp/images/lock.png b/app/src/main/webapp/images/lock.png deleted file mode 100755 index af561c1e16..0000000000 Binary files a/app/src/main/webapp/images/lock.png and /dev/null differ diff --git a/app/src/main/webapp/images/openid-logo-small.gif b/app/src/main/webapp/images/openid-logo-small.gif deleted file mode 100644 index cde836c893..0000000000 Binary files a/app/src/main/webapp/images/openid-logo-small.gif and /dev/null differ diff --git a/app/src/main/webapp/images/opml.png b/app/src/main/webapp/images/opml.png deleted file mode 100644 index a4624217bd..0000000000 Binary files a/app/src/main/webapp/images/opml.png and /dev/null differ diff --git a/app/src/main/webapp/images/page.png b/app/src/main/webapp/images/page.png deleted file mode 100644 index e0813b2274..0000000000 Binary files a/app/src/main/webapp/images/page.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_edit.png b/app/src/main/webapp/images/page_edit.png deleted file mode 100644 index 6079552617..0000000000 Binary files a/app/src/main/webapp/images/page_edit.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_white.png b/app/src/main/webapp/images/page_white.png deleted file mode 100755 index 3103c929e7..0000000000 Binary files a/app/src/main/webapp/images/page_white.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_white_add.png b/app/src/main/webapp/images/page_white_add.png deleted file mode 100644 index 555602cba3..0000000000 Binary files a/app/src/main/webapp/images/page_white_add.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_white_delete.png b/app/src/main/webapp/images/page_white_delete.png deleted file mode 100755 index 73e863847f..0000000000 Binary files a/app/src/main/webapp/images/page_white_delete.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_white_edit.png b/app/src/main/webapp/images/page_white_edit.png deleted file mode 100644 index 62ac3a5800..0000000000 Binary files a/app/src/main/webapp/images/page_white_edit.png and /dev/null differ diff --git a/app/src/main/webapp/images/page_white_gear.png b/app/src/main/webapp/images/page_white_gear.png deleted file mode 100755 index 3e9b9f7fe9..0000000000 Binary files a/app/src/main/webapp/images/page_white_gear.png and /dev/null differ diff --git a/app/src/main/webapp/images/permalink.gif b/app/src/main/webapp/images/permalink.gif deleted file mode 100644 index 2ec4a7eb5d..0000000000 Binary files a/app/src/main/webapp/images/permalink.gif and /dev/null differ diff --git a/app/src/main/webapp/images/rssbadge.gif b/app/src/main/webapp/images/rssbadge.gif deleted file mode 100644 index ecb0957541..0000000000 Binary files a/app/src/main/webapp/images/rssbadge.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/15.gif b/app/src/main/webapp/images/smileys/15.gif deleted file mode 100644 index 8fee1d5125..0000000000 Binary files a/app/src/main/webapp/images/smileys/15.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/19.gif b/app/src/main/webapp/images/smileys/19.gif deleted file mode 100644 index 7cd258f50f..0000000000 Binary files a/app/src/main/webapp/images/smileys/19.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/20.gif b/app/src/main/webapp/images/smileys/20.gif deleted file mode 100644 index 42af8d17cf..0000000000 Binary files a/app/src/main/webapp/images/smileys/20.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/28.gif b/app/src/main/webapp/images/smileys/28.gif deleted file mode 100644 index b8413c6faf..0000000000 Binary files a/app/src/main/webapp/images/smileys/28.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/angelic.gif b/app/src/main/webapp/images/smileys/angelic.gif deleted file mode 100644 index 5cbaf8bd5b..0000000000 Binary files a/app/src/main/webapp/images/smileys/angelic.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/angry.gif b/app/src/main/webapp/images/smileys/angry.gif deleted file mode 100644 index dd312e5fef..0000000000 Binary files a/app/src/main/webapp/images/smileys/angry.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/blush.gif b/app/src/main/webapp/images/smileys/blush.gif deleted file mode 100644 index 6d5bece19b..0000000000 Binary files a/app/src/main/webapp/images/smileys/blush.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/bored.gif b/app/src/main/webapp/images/smileys/bored.gif deleted file mode 100644 index 7cd258f50f..0000000000 Binary files a/app/src/main/webapp/images/smileys/bored.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/bucktooth.gif b/app/src/main/webapp/images/smileys/bucktooth.gif deleted file mode 100644 index 80b2e58884..0000000000 Binary files a/app/src/main/webapp/images/smileys/bucktooth.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/clown.gif b/app/src/main/webapp/images/smileys/clown.gif deleted file mode 100644 index 7a9c95d237..0000000000 Binary files a/app/src/main/webapp/images/smileys/clown.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/confused.gif b/app/src/main/webapp/images/smileys/confused.gif deleted file mode 100644 index dd5fbe0b1f..0000000000 Binary files a/app/src/main/webapp/images/smileys/confused.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/cry.gif b/app/src/main/webapp/images/smileys/cry.gif deleted file mode 100644 index 817608d960..0000000000 Binary files a/app/src/main/webapp/images/smileys/cry.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/depressed.gif b/app/src/main/webapp/images/smileys/depressed.gif deleted file mode 100644 index 050e7be6a5..0000000000 Binary files a/app/src/main/webapp/images/smileys/depressed.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/devil.gif b/app/src/main/webapp/images/smileys/devil.gif deleted file mode 100644 index 3e8af5ea43..0000000000 Binary files a/app/src/main/webapp/images/smileys/devil.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/doh.gif b/app/src/main/webapp/images/smileys/doh.gif deleted file mode 100644 index c60f76eb12..0000000000 Binary files a/app/src/main/webapp/images/smileys/doh.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/drool.gif b/app/src/main/webapp/images/smileys/drool.gif deleted file mode 100644 index 898199f43d..0000000000 Binary files a/app/src/main/webapp/images/smileys/drool.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/drunk.gif b/app/src/main/webapp/images/smileys/drunk.gif deleted file mode 100644 index 9032b75bff..0000000000 Binary files a/app/src/main/webapp/images/smileys/drunk.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/grin.gif b/app/src/main/webapp/images/smileys/grin.gif deleted file mode 100644 index 7231d31e52..0000000000 Binary files a/app/src/main/webapp/images/smileys/grin.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/hand.gif b/app/src/main/webapp/images/smileys/hand.gif deleted file mode 100644 index 51c21cd44b..0000000000 Binary files a/app/src/main/webapp/images/smileys/hand.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/kiss.gif b/app/src/main/webapp/images/smileys/kiss.gif deleted file mode 100644 index 34117382fe..0000000000 Binary files a/app/src/main/webapp/images/smileys/kiss.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/laugh.gif b/app/src/main/webapp/images/smileys/laugh.gif deleted file mode 100644 index 924c4a6472..0000000000 Binary files a/app/src/main/webapp/images/smileys/laugh.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/love.gif b/app/src/main/webapp/images/smileys/love.gif deleted file mode 100644 index 114100b774..0000000000 Binary files a/app/src/main/webapp/images/smileys/love.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/rolleyes.gif b/app/src/main/webapp/images/smileys/rolleyes.gif deleted file mode 100644 index afff82b583..0000000000 Binary files a/app/src/main/webapp/images/smileys/rolleyes.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/sad.gif b/app/src/main/webapp/images/smileys/sad.gif deleted file mode 100644 index edb28c8016..0000000000 Binary files a/app/src/main/webapp/images/smileys/sad.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/shush.gif b/app/src/main/webapp/images/smileys/shush.gif deleted file mode 100644 index e6e3cb3672..0000000000 Binary files a/app/src/main/webapp/images/smileys/shush.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/sick.gif b/app/src/main/webapp/images/smileys/sick.gif deleted file mode 100644 index 9032b75bff..0000000000 Binary files a/app/src/main/webapp/images/smileys/sick.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/silly.gif b/app/src/main/webapp/images/smileys/silly.gif deleted file mode 100644 index c3ec66d595..0000000000 Binary files a/app/src/main/webapp/images/smileys/silly.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/sleep.gif b/app/src/main/webapp/images/smileys/sleep.gif deleted file mode 100644 index 671d765c66..0000000000 Binary files a/app/src/main/webapp/images/smileys/sleep.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/smile.gif b/app/src/main/webapp/images/smileys/smile.gif deleted file mode 100644 index edd17efcc8..0000000000 Binary files a/app/src/main/webapp/images/smileys/smile.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/smirk.gif b/app/src/main/webapp/images/smileys/smirk.gif deleted file mode 100644 index 6210866227..0000000000 Binary files a/app/src/main/webapp/images/smileys/smirk.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/smug.gif b/app/src/main/webapp/images/smileys/smug.gif deleted file mode 100644 index 6c0f258e91..0000000000 Binary files a/app/src/main/webapp/images/smileys/smug.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/sunglasses.gif b/app/src/main/webapp/images/smileys/sunglasses.gif deleted file mode 100644 index 10d98b4eba..0000000000 Binary files a/app/src/main/webapp/images/smileys/sunglasses.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/surprised.gif b/app/src/main/webapp/images/smileys/surprised.gif deleted file mode 100644 index 0368ebbd83..0000000000 Binary files a/app/src/main/webapp/images/smileys/surprised.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/thinker.gif b/app/src/main/webapp/images/smileys/thinker.gif deleted file mode 100644 index 54a7c9cba9..0000000000 Binary files a/app/src/main/webapp/images/smileys/thinker.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/tongue.gif b/app/src/main/webapp/images/smileys/tongue.gif deleted file mode 100644 index f8306fac9b..0000000000 Binary files a/app/src/main/webapp/images/smileys/tongue.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/whisper.gif b/app/src/main/webapp/images/smileys/whisper.gif deleted file mode 100644 index f4695506f5..0000000000 Binary files a/app/src/main/webapp/images/smileys/whisper.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smileys/wink.gif b/app/src/main/webapp/images/smileys/wink.gif deleted file mode 100644 index 749f547b17..0000000000 Binary files a/app/src/main/webapp/images/smileys/wink.gif and /dev/null differ diff --git a/app/src/main/webapp/images/smrssbadge.gif b/app/src/main/webapp/images/smrssbadge.gif deleted file mode 100644 index 5ebeb36a57..0000000000 Binary files a/app/src/main/webapp/images/smrssbadge.gif and /dev/null differ diff --git a/app/src/main/webapp/images/table_edit.png b/app/src/main/webapp/images/table_edit.png deleted file mode 100644 index 061da94b0f..0000000000 Binary files a/app/src/main/webapp/images/table_edit.png and /dev/null differ diff --git a/app/src/main/webapp/images/table_error.png b/app/src/main/webapp/images/table_error.png deleted file mode 100644 index 0c4795cc32..0000000000 Binary files a/app/src/main/webapp/images/table_error.png and /dev/null differ diff --git a/app/src/main/webapp/images/table_gear.png b/app/src/main/webapp/images/table_gear.png deleted file mode 100644 index 9a4d66d2fc..0000000000 Binary files a/app/src/main/webapp/images/table_gear.png and /dev/null differ diff --git a/app/src/main/webapp/images/table_multiple.png b/app/src/main/webapp/images/table_multiple.png deleted file mode 100644 index 593954398e..0000000000 Binary files a/app/src/main/webapp/images/table_multiple.png and /dev/null differ diff --git a/app/src/main/webapp/images/user.png b/app/src/main/webapp/images/user.png deleted file mode 100644 index 1e26c0cde3..0000000000 Binary files a/app/src/main/webapp/images/user.png and /dev/null differ diff --git a/app/src/main/webapp/images/world_go.png b/app/src/main/webapp/images/world_go.png deleted file mode 100644 index b25d7c1a8e..0000000000 Binary files a/app/src/main/webapp/images/world_go.png and /dev/null differ diff --git a/app/src/main/webapp/images/zoom.png b/app/src/main/webapp/images/zoom.png deleted file mode 100644 index c5f98f2dfd..0000000000 Binary files a/app/src/main/webapp/images/zoom.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/images/layout.png b/app/src/main/webapp/roller-ui/images/layout.png deleted file mode 100644 index ea086b0428..0000000000 Binary files a/app/src/main/webapp/roller-ui/images/layout.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/images/logo-shadow.png b/app/src/main/webapp/roller-ui/images/logo-shadow.png deleted file mode 100644 index 65ef9c87ce..0000000000 Binary files a/app/src/main/webapp/roller-ui/images/logo-shadow.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/images/transparent-logo.png b/app/src/main/webapp/roller-ui/images/transparent-logo.png deleted file mode 100644 index dadc04ab89..0000000000 Binary files a/app/src/main/webapp/roller-ui/images/transparent-logo.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/blue/colors.css b/app/src/main/webapp/roller-ui/theme/blue/colors.css deleted file mode 100644 index eb6882c718..0000000000 --- a/app/src/main/webapp/roller-ui/theme/blue/colors.css +++ /dev/null @@ -1,180 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. The ASF licenses this file to You -* under the Apache License, Version 2.0 (the "License"); you may not -* use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. For additional information regarding -* copyright in this work, please see the NOTICE file in the top level -* directory of this distribution. -*/ - -/* BLUE : Customizable colors and images */ - -/* ------------------------------------------------------------------------ */ -/* add colors and images to roller.css */ - -#logobackground { - background: #573dea !important; -} -.bannerBox { - background: url("two-banner.png") repeat-x top; -} -.bannerStatusBox { - background: #e3e3e3; - color: #573dea; -} -.bannerStatusBox a { - color: #573dea; -} -.bannerStatusBox a:link { - color: #573dea; -} -.bannerStatusBox a:visited { - color: #573dea; -} -h1 { - color: #432eb3; -} -h2 { - color: #432eb3; -} -h3 { - color: #432eb3; -} -a:link { - color: #573dea; -} -a:visited { - color: #573dea; -} -.subtitle span { - color: #573dea; -} -table.rollertable th, table.rollertable th { - background: #573dea; -} -table.rollertable td, table.rollertable tbody td { - border: 1px solid #573dea; -} -a.entryTitle, a:active.entryTitle, a:visited.entryTitle { - color: black; -} -div.centerTitle { - background: #e3e3e3; -} -div.control { - background: #e3e3e3; -} -div.controlToggle { - background: url("two-togglegrey.png") repeat-x top; -} -div.entryBox { - border-bottom: 1px #573dea solid; - background: #e3e3e3; - margin: 0px 0px 0px 0px; -} -div.entryTitleBox { - padding: 4px; - font-size: medium; -} -div.entryBoxPinned { - background: #e3e3e3; - border-bottom: 1px #573dea solid; -} -div.entriesBox { - background: #e3e3e3; -} -a.entryTitle, a:active.entryTitle, a:visited.entryTitle { - color: #573dea; - font-size: medium; - font-weight: bold; -} -div.yourWeblogBox { - border-top: 1px #573dea solid; -} -input.searchButton { - color: white; - background: #432eb3; -} -.sidebarBodyHead { - background: #432eb3; - color: white; -} -.searchSidebarBodyHead h3 { - color: black; -} -.sidebarBodyHead h3 { - color: white; -} -.sidebarFade, div.sidebarBody { - background: #e3e3e3; - color: #666666; -} -.searchSidebarHead { - background: #e3e3e3; -} -.searchSidebarBody { - background: #e3e3e3; -} - -/* ------------------------------------------------------------------------ */ -/* add colors and iamges to menu.css */ - -td.menuTabSelected { - background: url("menutab-sel.png"); -} -td.menuTabUnselected { - background: url("menutab-unsel.png"); -} -.menuItemTable { - background-color: #573dea; - color: white; -} -td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active { - color: white; -} -td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active { - color: white; -} -a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active { - color: white; -} -a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active { - color: white; -} - -/* for main menu page */ - -span.mm_weblog_name { - color: #707277; -} -td.mm_table_actions { - background: #fff4d4; -} - - -/* RTE editor */ - -.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered, .rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage { - background: #e3e3e3; -} -.rteImage { - border: 1px solid #bcc5cd; -} -.rteImageSm { - border: 1px solid #bcc5cd; -} -.rteDiv { - border: 1px solid #bcc5cd; -} - - - diff --git a/app/src/main/webapp/roller-ui/theme/blue/menutab-sel.png b/app/src/main/webapp/roller-ui/theme/blue/menutab-sel.png deleted file mode 100755 index b24be2c616..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/blue/menutab-sel.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/blue/menutab-unsel.png b/app/src/main/webapp/roller-ui/theme/blue/menutab-unsel.png deleted file mode 100755 index ee04872f91..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/blue/menutab-unsel.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/blue/two-banner.png b/app/src/main/webapp/roller-ui/theme/blue/two-banner.png deleted file mode 100644 index 64f9ca50a5..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/blue/two-banner.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/blue/two-smallbadge.png b/app/src/main/webapp/roller-ui/theme/blue/two-smallbadge.png deleted file mode 100644 index 6cd42c720e..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/blue/two-smallbadge.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/blue/two-togglegrey.png b/app/src/main/webapp/roller-ui/theme/blue/two-togglegrey.png deleted file mode 100644 index 9d52433c39..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/blue/two-togglegrey.png and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/colors.css b/app/src/main/webapp/roller-ui/theme/sun/colors.css deleted file mode 100644 index 6149e8bea3..0000000000 --- a/app/src/main/webapp/roller-ui/theme/sun/colors.css +++ /dev/null @@ -1,206 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. The ASF licenses this file to You -* under the Apache License, Version 2.0 (the "License"); you may not -* use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. For additional information regarding -* copyright in this work, please see the NOTICE file in the top level -* directory of this distribution. -*/ -/* SUN : Customizable colors and images */ - -/* ------------------------------------------------------------------------ */ -/* add colors and images to roller.css */ - -#logobackground { - background: #e77100 !important; -} -.bannerBox { - background: url("two-banner.gif") repeat-x top; - border-bottom: 2px black solid; - color: #666666; -} -.bannerStatusBox { - background: #dde6ec; - color: #666666; -} -#footer { - border: none; - color: #5d7992; -} -h1 { - color: #e77100; -} -h2 { - color: #e77100; -} -h3 { - color: black; -} -p.subtitle { - color: #000000; -} -.subtitle span { - color: #52829c; -} -a { - color: #35556B; -} -a:link { - color: #35556B; -} -a:visited { - color: #35556B; -} -a:hover { - color: #35556B; -} -a:active { - color: #35556B; -} -table.rollertable th, table.rollertable th { - background: #52829c; -} -table.rollertable td, table.rollertable tbody td { - border: 1px solid #52829c; -} -div.centerTitle { - background: #dee7ef; -} -div.control { - background: #dee7ef; -} -div.controlToggle { - background: url("two-togglegrey.gif") repeat-x top; -} -div.entriesBox { - background: #e3e3e3; -} -div.entryTitleBox { - color: #35556B; - background: #dee7ef; -} -div.entryBox { - border-bottom: 1px #999999 solid; -} -div.entryBoxPinned { - border-bottom: 1px grey solid; -} -.entryDetails { - color: #666666; -} -.entryDescription { - color: black; -} -.yourWeblogBox { - border-top: 1px solid #999; -} -input.searchButton { - color: white; - background: #e77100; -} -.sidebarBodyHead { - background: #3d5c71; - color: white; -} -.searchSidebarBodyHead h3 { - color: black; -} -.sidebarBodyHead h3 { - color: white; -} -.sidebarFade, div.sidebarBody { - background: #ccdae3; - color: #666666; -} -.searchSidebarHead { - background: #d1d766; -} -.searchSidebarBody { - background: #d1d766; -} - -/* ------------------------------------------------------------------------ */ -/* add colors and iamges to menu.css */ - -td.menuTabSelected { - background: url("menutab-sel.gif"); - /* background-color: #52829c; */ -} -td.menuTabUnselected { - background: url("menutab-unsel.gif"); - /* background-color: #bdbdbd; */ -} -.menuItemTable { - background-color: #52829c; - color: white; -} -td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active { - color: white; -} -td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active { - color: #52829c; -} -a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active { - color: white; -} -a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active { - color: white; -} -a.menuItemSelected:hover { - color: white; - text-decoration: none; -} -td.menuTabSelected a:hover { - color: white; - text-decoration: none; -} - -/* for main menu page */ - -span.mm_weblog_name { - color: #707277; -} -td.mm_table_actions { - background: #fff4d4; -} - -/* RTE editor */ - -.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered, .rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage { - background: #dee7ef; -} -.rteImage { - border: 1px solid #bcc5cd; -} -.rteImageSm { - border: 1px solid #bcc5cd; -} -.rteDiv { - border: 1px solid #bcc5cd; -} - - -.htmlarea .toolbar { - background: #dee7ef; -} - -.htmlarea .toolbar .button { - background: #dee7ef; -} - -.htmlarea .toolbar a.buttonDisabled:hover { - background: #dee7ef; -} - -.htmlarea .statusBar { - background: #dee7ef; -} diff --git a/app/src/main/webapp/roller-ui/theme/sun/menutab-sel.gif b/app/src/main/webapp/roller-ui/theme/sun/menutab-sel.gif deleted file mode 100644 index 89161788f9..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/menutab-sel.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/menutab-unsel.gif b/app/src/main/webapp/roller-ui/theme/sun/menutab-unsel.gif deleted file mode 100644 index dbd1ecc2e1..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/menutab-unsel.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/two-banner.gif b/app/src/main/webapp/roller-ui/theme/sun/two-banner.gif deleted file mode 100644 index 2e52687f56..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/two-banner.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade-search.gif b/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade-search.gif deleted file mode 100644 index f5d51aeca8..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade-search.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade.gif b/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade.gif deleted file mode 100644 index d4771e251e..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/two-sidebarfade.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/sun/two-togglegrey.gif b/app/src/main/webapp/roller-ui/theme/sun/two-togglegrey.gif deleted file mode 100644 index f45e9559e3..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/sun/two-togglegrey.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/tan/colors.css b/app/src/main/webapp/roller-ui/theme/tan/colors.css deleted file mode 100644 index cdceb3a887..0000000000 --- a/app/src/main/webapp/roller-ui/theme/tan/colors.css +++ /dev/null @@ -1,200 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. The ASF licenses this file to You -* under the Apache License, Version 2.0 (the "License"); you may not -* use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. For additional information regarding -* copyright in this work, please see the NOTICE file in the top level -* directory of this distribution. -*/ - -/* TAN : Customizable colors and images */ - -/* ------------------------------------------------------------------------ */ -/* add colors and images to roller.css */ - -#logobackground { - background: #ad3431 !important; -} -.bannerBox { - background: url("two-banner.gif") repeat-x top; -} -.bannerStatusBox { - background: #ad3431; - color: white; -} -.bannerStatusBox a { - color: white; -} -.bannerStatusBox a:link { - color: white; -} -.bannerStatusBox a:visited { - color: white; -} -h1 { - color: #ad3537; -} -h2 { - color: #ad3537; -} -h3 { - background: transparent; - color: #ad3537; - font-weight: bold; -} -.fakelink { - color: #ad3537; -} -a:link { - color: #ad3537; -} -a:visited { - color: #ad3537; -} -.subtitle span { - color: #ad3431; -} -table.rollertable th, table.rollertable th { - background: #c6ab74; -} -table.rollertable td, table.rollertable tbody td { - border: 1px solid #c6ab74; -} -a.entryTitle, a:active.entryTitle, a:visited.entryTitle { - color: #ad3537; -} -div.centerTitle { - background: #c6ab74; -} -div.control { - background: #c6ab74; -} -div.controlToggle { - background: url("two-togglegrey.gif") repeat-x top; -} -div.entriesBox { - background: #f1ebdf; -} -div.entryTitleBox { - color: white; - background: #c6ab74; -} -div.entryBox { - border-bottom: 1px #c8af7b solid; -} -div.entryTitleBox { - font-size: medium; -} -div.entryBoxPinned { - background: #f1ebdf; - border-bottom: 1px #c8af7b solid; -} -a.entryTitle, a:active.entryTitle, a:visited.entryTitle { - color: #ad3537; - font-size: medium; - font-weight: bold; -} -div.yourWeblogBox { - border-top: 1px #c6ab74 solid; -} -input.searchButton { - color: white; - background: #ad3431; -} -.sidebarBodyHead { - background: #ad3431; - color: white; -} -.searchSidebarBodyHead h3 { - color: black; -} -.sidebarBodyHead h3 { - color: white; -} -.sidebarFade, div.sidebarBody { - background: #f1ebdf; - color: #666666; -} -.searchSidebarHead { - background: #f1ebdf; -} -.searchSidebarBody { - background: #f1ebdf; -} - -/* ------------------------------------------------------------------------ */ -/* add colors and iamges to menu.css */ - -td.menuTabSelected { - background: url("menutab-sel.gif") repeat-x; -} -td.menuTabUnselected { - background: url("menutab-unsel.gif") repeat-x; -} -.menuItemTable { - background-color: #c6ab74; - color: black; -} -td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active { - color: black; -} -td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active { - color: black; -} -a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active { - color: black; -} -a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active { - color: black; -} - -/* for main menu page */ - -span.mm_weblog_name { - color: #707277; -} -td.mm_table_actions { - background: #fff4d4; -} - -/* RTE editor */ - -.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered, .rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage { - background: #f1ebdf; -} -.rteImage { - border: 1px solid #d0cabc; -} -.rteImageSm { - border: 1px solid #d0cabc; -} -.rteDiv { - border: 1px solid #d0cabc; -} - - - -.htmlarea .toolbar { - background: #f1ebdf; -} - -.htmlarea .toolbar .button { - background: #f1ebdf; -} - -.htmlarea .toolbar a.buttonDisabled:hover { - background: #f1ebdf; -} - -.htmlarea .statusBar { - background: #f1ebdf; -} \ No newline at end of file diff --git a/app/src/main/webapp/roller-ui/theme/tan/two-banner.gif b/app/src/main/webapp/roller-ui/theme/tan/two-banner.gif deleted file mode 100644 index 7684cdfd2b..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/tan/two-banner.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/tan/two-bigbadge.gif b/app/src/main/webapp/roller-ui/theme/tan/two-bigbadge.gif deleted file mode 100644 index e4a2b14344..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/tan/two-bigbadge.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/tan/two-sidebarfade.gif b/app/src/main/webapp/roller-ui/theme/tan/two-sidebarfade.gif deleted file mode 100644 index b73450ec88..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/tan/two-sidebarfade.gif and /dev/null differ diff --git a/app/src/main/webapp/roller-ui/theme/tan/two-togglegrey.gif b/app/src/main/webapp/roller-ui/theme/tan/two-togglegrey.gif deleted file mode 100644 index f0f26cca4f..0000000000 Binary files a/app/src/main/webapp/roller-ui/theme/tan/two-togglegrey.gif and /dev/null differ diff --git a/app/src/main/webapp/theme/scripts/searchhi.js b/app/src/main/webapp/theme/scripts/searchhi.js deleted file mode 100644 index e9aa08df02..0000000000 --- a/app/src/main/webapp/theme/scripts/searchhi.js +++ /dev/null @@ -1,86 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. The ASF licenses this file to You -* under the Apache License, Version 2.0 (the "License"); you may not -* use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. For additional information regarding -* copyright in this work, please see the NOTICE file in the top level -* directory of this distribution. -*/ -/* http://www.kryogenix.org/code/browser/searchhi/ */ -/* Modified 20021006 to fix query string parsing and add case insensitivity */ -function highlightWord(node,word) { - // Iterate into this nodes childNodes - if (node.hasChildNodes) { - var hi_cn; - for (hi_cn=0;hi_cn

+
#showNextPrevSearchControl($pager) #set($pager = $model.getWeblogEntriesPager()) #showWeblogEntriesPager($pager) diff --git a/app/src/main/webapp/themes/fauxcoly/searchhi.js b/app/src/main/webapp/themes/fauxcoly/searchhi.js deleted file mode 100644 index 901bc600cb..0000000000 --- a/app/src/main/webapp/themes/fauxcoly/searchhi.js +++ /dev/null @@ -1,112 +0,0 @@ -/* http://www.kryogenix.org/code/browser/searchhi/ */ -/* Modified 20021006 to fix query string parsing and add case insensitivity */ -/* Modified 20070316 to stop highlighting inside nosearchhi nodes */ -/* Modified 20081217 to do in-page searching and wrap up in an object */ -/* Modified 20081218 to scroll to first hit like - http://www.woolyss.free.fr/js/searchhi_Woolyss.js and say when not found */ - -var searchhi = { - highlightWord: function(node,word) { - // Iterate into this nodes childNodes - if (node.hasChildNodes) { - for (var hi_cn=0;hi_cnspan>a { a.permalink { padding: 2px 0px 2px 20px; - background: url('$url.resource("icons/icon_clock.gif")') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23b8862b' viewBox='0 0 16 16'%3E%3Cpath d='M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z'/%3E%3Cpath d='M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } a.tagLink { padding: 2px 0px 2px 20px; - background: url('$url.resource("icons/tag_blue.png")') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%233a87ad' viewBox='0 0 16 16'%3E%3Cpath d='M6 4.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-1 0a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0'/%3E%3Cpath d='M2 1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 1 6.586V2a1 1 0 0 1 1-1m0 5.586 7 7L13.586 9l-7-7H2z'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } a.commentslink { padding: 2px 0px 2px 20px; - background: url('$url.resource("icons/comment.gif")') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%234a90d9' viewBox='0 0 16 16'%3E%3Cpath d='M14 1a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H4.414A2 2 0 0 0 3 11.586l-2 2V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12.793a.5.5 0 0 0 .854.353l2.853-2.853A1 1 0 0 1 4.414 12H14a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } ul.presentationLinks li { list-style-type: none; list-style-position: outside; - list-style-image: url('$url.resource("icons/page_white_acrobat.png")'); + list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23c9302c' viewBox='0 0 16 16'%3E%3Cpath d='M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2M9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5z'/%3E%3Cpath d='M4.603 14.087a.8.8 0 0 1-.438-.42c-.195-.388-.13-.776.08-1.102.198-.307.526-.568.897-.787a7.7 7.7 0 0 1 1.482-.645 20 20 0 0 0 1.062-2.227 7.3 7.3 0 0 1-.43-1.295c-.086-.4-.119-.796-.046-1.136.075-.354.274-.672.65-.823.192-.077.4-.12.602-.077a.7.7 0 0 1 .477.365c.088.164.12.356.127.538.007.188-.012.396-.047.614-.084.51-.27 1.134-.52 1.794a11 11 0 0 0 .98 1.686 5.8 5.8 0 0 1 1.334.05c.364.066.734.195.96.465.12.144.193.32.2.518.007.192-.047.382-.138.563a1.04 1.04 0 0 1-.354.416.86.86 0 0 1-.51.138c-.331-.014-.654-.196-.933-.417a5.7 5.7 0 0 1-.911-.95 11.7 11.7 0 0 0-1.997.406 11.3 11.3 0 0 1-1.02 1.51c-.292.35-.609.656-.927.787a.8.8 0 0 1-.58.029m1.379-1.901q-.25.115-.459.238c-.328.194-.541.383-.647.547-.094.145-.096.25-.04.361q.016.032.026.044l.035-.012c.137-.056.355-.235.635-.572a8 8 0 0 0 .45-.606m1.64-1.33a13 13 0 0 1 1.01-.193 12 12 0 0 1-.51-.858 21 21 0 0 1-.5 1.05zm2.446.45q.226.245.435.41c.24.19.407.253.498.256a.1.1 0 0 0 .07-.015.3.3 0 0 0 .094-.125.44.44 0 0 0 .059-.2.1.1 0 0 0-.026-.063c-.052-.062-.2-.152-.518-.209a4 4 0 0 0-.612-.053zM8.078 7.8a7 7 0 0 0 .2-.828q.046-.282.038-.465a.6.6 0 0 0-.032-.198.5.5 0 0 0-.145.04c-.087.035-.158.106-.196.283-.04.192-.03.469.046.822q.036.167.09.346z'/%3E%3C/svg%3E"); padding: 0.5em 0 0 0; margin: 0 0 0 0; } @@ -228,7 +228,7 @@ ul.presentationLinks li { #sidebar_content li.entryLink { padding: 0.5em 0 0 0; list-style-position: outside; - list-style-image: url('$url.resource("icons/page_white.png")'); + list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23777' viewBox='0 0 16 16'%3E%3Cpath d='M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5z'/%3E%3C/svg%3E"); } ul.activities { margin-left: 1em; diff --git a/app/src/main/webapp/themes/fauxcoly/theme.xml b/app/src/main/webapp/themes/fauxcoly/theme.xml index b92069cb7f..2e0fda09c3 100644 --- a/app/src/main/webapp/themes/fauxcoly/theme.xml +++ b/app/src/main/webapp/themes/fauxcoly/theme.xml @@ -163,39 +163,13 @@ - - + + - - - - - - - - - - - - - - - diff --git a/app/src/main/webapp/themes/fauxcoly/weblog.vm b/app/src/main/webapp/themes/fauxcoly/weblog.vm index b8dbd3171e..d323d75e09 100644 --- a/app/src/main/webapp/themes/fauxcoly/weblog.vm +++ b/app/src/main/webapp/themes/fauxcoly/weblog.vm @@ -90,7 +90,7 @@ Click the link below to subscribe via your favorite feed reader:

diff --git a/app/src/main/webapp/themes/frontpage/weblog.vm b/app/src/main/webapp/themes/frontpage/weblog.vm index 0a8a6f8996..61321acaa3 100644 --- a/app/src/main/webapp/themes/frontpage/weblog.vm +++ b/app/src/main/webapp/themes/frontpage/weblog.vm @@ -114,7 +114,7 @@
- Combined RSS feed for site. + Right-click, copy link and paste into your newsfeed reader diff --git a/app/src/main/webapp/themes/gaurav/css/font-awesome.min.css b/app/src/main/webapp/themes/gaurav/css/font-awesome.min.css deleted file mode 100755 index 866437fa41..0000000000 --- a/app/src/main/webapp/themes/gaurav/css/font-awesome.min.css +++ /dev/null @@ -1,403 +0,0 @@ -@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} -[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;} -.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;} -a [class^="icon-"],a [class*=" icon-"]{display:inline;} -[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;} -.icons-ul{margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;} -.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit;} -[class^="icon-"].hide,[class*=" icon-"].hide{display:none;} -.icon-muted{color:#eeeeee;} -.icon-light{color:#ffffff;} -.icon-dark{color:#333333;} -.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.icon-2x{font-size:2em;}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.icon-3x{font-size:3em;}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.icon-5x{font-size:5em;}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px;} -.pull-right{float:right;} -.pull-left{float:left;} -[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;} -[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;} -[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;} -.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;} -.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;} -.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;} -.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;} -.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;} -.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;} -.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;} -.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;} -.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;} -.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;} -.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;} -.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;} -.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;} -.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;} -a .icon-stack,a .icon-spin{display:inline-block;text-decoration:none;} -@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);} -.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);} -.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);} -.icon-flip-horizontal:before{-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1);} -.icon-flip-vertical:before{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1);} -a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block;} -.icon-glass:before{content:"\f000";} -.icon-music:before{content:"\f001";} -.icon-search:before{content:"\f002";} -.icon-envelope-alt:before{content:"\f003";} -.icon-heart:before{content:"\f004";} -.icon-star:before{content:"\f005";} -.icon-star-empty:before{content:"\f006";} -.icon-user:before{content:"\f007";} -.icon-film:before{content:"\f008";} -.icon-th-large:before{content:"\f009";} -.icon-th:before{content:"\f00a";} -.icon-th-list:before{content:"\f00b";} -.icon-ok:before{content:"\f00c";} -.icon-remove:before{content:"\f00d";} -.icon-zoom-in:before{content:"\f00e";} -.icon-zoom-out:before{content:"\f010";} -.icon-power-off:before,.icon-off:before{content:"\f011";} -.icon-signal:before{content:"\f012";} -.icon-gear:before,.icon-cog:before{content:"\f013";} -.icon-trash:before{content:"\f014";} -.icon-home:before{content:"\f015";} -.icon-file-alt:before{content:"\f016";} -.icon-time:before{content:"\f017";} -.icon-road:before{content:"\f018";} -.icon-download-alt:before{content:"\f019";} -.icon-download:before{content:"\f01a";} -.icon-upload:before{content:"\f01b";} -.icon-inbox:before{content:"\f01c";} -.icon-play-circle:before{content:"\f01d";} -.icon-rotate-right:before,.icon-repeat:before{content:"\f01e";} -.icon-refresh:before{content:"\f021";} -.icon-list-alt:before{content:"\f022";} -.icon-lock:before{content:"\f023";} -.icon-flag:before{content:"\f024";} -.icon-headphones:before{content:"\f025";} -.icon-volume-off:before{content:"\f026";} -.icon-volume-down:before{content:"\f027";} -.icon-volume-up:before{content:"\f028";} -.icon-qrcode:before{content:"\f029";} -.icon-barcode:before{content:"\f02a";} -.icon-tag:before{content:"\f02b";} -.icon-tags:before{content:"\f02c";} -.icon-book:before{content:"\f02d";} -.icon-bookmark:before{content:"\f02e";} -.icon-print:before{content:"\f02f";} -.icon-camera:before{content:"\f030";} -.icon-font:before{content:"\f031";} -.icon-bold:before{content:"\f032";} -.icon-italic:before{content:"\f033";} -.icon-text-height:before{content:"\f034";} -.icon-text-width:before{content:"\f035";} -.icon-align-left:before{content:"\f036";} -.icon-align-center:before{content:"\f037";} -.icon-align-right:before{content:"\f038";} -.icon-align-justify:before{content:"\f039";} -.icon-list:before{content:"\f03a";} -.icon-indent-left:before{content:"\f03b";} -.icon-indent-right:before{content:"\f03c";} -.icon-facetime-video:before{content:"\f03d";} -.icon-picture:before{content:"\f03e";} -.icon-pencil:before{content:"\f040";} -.icon-map-marker:before{content:"\f041";} -.icon-adjust:before{content:"\f042";} -.icon-tint:before{content:"\f043";} -.icon-edit:before{content:"\f044";} -.icon-share:before{content:"\f045";} -.icon-check:before{content:"\f046";} -.icon-move:before{content:"\f047";} -.icon-step-backward:before{content:"\f048";} -.icon-fast-backward:before{content:"\f049";} -.icon-backward:before{content:"\f04a";} -.icon-play:before{content:"\f04b";} -.icon-pause:before{content:"\f04c";} -.icon-stop:before{content:"\f04d";} -.icon-forward:before{content:"\f04e";} -.icon-fast-forward:before{content:"\f050";} -.icon-step-forward:before{content:"\f051";} -.icon-eject:before{content:"\f052";} -.icon-chevron-left:before{content:"\f053";} -.icon-chevron-right:before{content:"\f054";} -.icon-plus-sign:before{content:"\f055";} -.icon-minus-sign:before{content:"\f056";} -.icon-remove-sign:before{content:"\f057";} -.icon-ok-sign:before{content:"\f058";} -.icon-question-sign:before{content:"\f059";} -.icon-info-sign:before{content:"\f05a";} -.icon-screenshot:before{content:"\f05b";} -.icon-remove-circle:before{content:"\f05c";} -.icon-ok-circle:before{content:"\f05d";} -.icon-ban-circle:before{content:"\f05e";} -.icon-arrow-left:before{content:"\f060";} -.icon-arrow-right:before{content:"\f061";} -.icon-arrow-up:before{content:"\f062";} -.icon-arrow-down:before{content:"\f063";} -.icon-mail-forward:before,.icon-share-alt:before{content:"\f064";} -.icon-resize-full:before{content:"\f065";} -.icon-resize-small:before{content:"\f066";} -.icon-plus:before{content:"\f067";} -.icon-minus:before{content:"\f068";} -.icon-asterisk:before{content:"\f069";} -.icon-exclamation-sign:before{content:"\f06a";} -.icon-gift:before{content:"\f06b";} -.icon-leaf:before{content:"\f06c";} -.icon-fire:before{content:"\f06d";} -.icon-eye-open:before{content:"\f06e";} -.icon-eye-close:before{content:"\f070";} -.icon-warning-sign:before{content:"\f071";} -.icon-plane:before{content:"\f072";} -.icon-calendar:before{content:"\f073";} -.icon-random:before{content:"\f074";} -.icon-comment:before{content:"\f075";} -.icon-magnet:before{content:"\f076";} -.icon-chevron-up:before{content:"\f077";} -.icon-chevron-down:before{content:"\f078";} -.icon-retweet:before{content:"\f079";} -.icon-shopping-cart:before{content:"\f07a";} -.icon-folder-close:before{content:"\f07b";} -.icon-folder-open:before{content:"\f07c";} -.icon-resize-vertical:before{content:"\f07d";} -.icon-resize-horizontal:before{content:"\f07e";} -.icon-bar-chart:before{content:"\f080";} -.icon-twitter-sign:before{content:"\f081";} -.icon-facebook-sign:before{content:"\f082";} -.icon-camera-retro:before{content:"\f083";} -.icon-key:before{content:"\f084";} -.icon-gears:before,.icon-cogs:before{content:"\f085";} -.icon-comments:before{content:"\f086";} -.icon-thumbs-up-alt:before{content:"\f087";} -.icon-thumbs-down-alt:before{content:"\f088";} -.icon-star-half:before{content:"\f089";} -.icon-heart-empty:before{content:"\f08a";} -.icon-signout:before{content:"\f08b";} -.icon-linkedin-sign:before{content:"\f08c";} -.icon-pushpin:before{content:"\f08d";} -.icon-external-link:before{content:"\f08e";} -.icon-signin:before{content:"\f090";} -.icon-trophy:before{content:"\f091";} -.icon-github-sign:before{content:"\f092";} -.icon-upload-alt:before{content:"\f093";} -.icon-lemon:before{content:"\f094";} -.icon-phone:before{content:"\f095";} -.icon-unchecked:before,.icon-check-empty:before{content:"\f096";} -.icon-bookmark-empty:before{content:"\f097";} -.icon-phone-sign:before{content:"\f098";} -.icon-twitter:before{content:"\f099";} -.icon-facebook:before{content:"\f09a";} -.icon-github:before{content:"\f09b";} -.icon-unlock:before{content:"\f09c";} -.icon-credit-card:before{content:"\f09d";} -.icon-rss:before{content:"\f09e";} -.icon-hdd:before{content:"\f0a0";} -.icon-bullhorn:before{content:"\f0a1";} -.icon-bell:before{content:"\f0a2";} -.icon-certificate:before{content:"\f0a3";} -.icon-hand-right:before{content:"\f0a4";} -.icon-hand-left:before{content:"\f0a5";} -.icon-hand-up:before{content:"\f0a6";} -.icon-hand-down:before{content:"\f0a7";} -.icon-circle-arrow-left:before{content:"\f0a8";} -.icon-circle-arrow-right:before{content:"\f0a9";} -.icon-circle-arrow-up:before{content:"\f0aa";} -.icon-circle-arrow-down:before{content:"\f0ab";} -.icon-globe:before{content:"\f0ac";} -.icon-wrench:before{content:"\f0ad";} -.icon-tasks:before{content:"\f0ae";} -.icon-filter:before{content:"\f0b0";} -.icon-briefcase:before{content:"\f0b1";} -.icon-fullscreen:before{content:"\f0b2";} -.icon-group:before{content:"\f0c0";} -.icon-link:before{content:"\f0c1";} -.icon-cloud:before{content:"\f0c2";} -.icon-beaker:before{content:"\f0c3";} -.icon-cut:before{content:"\f0c4";} -.icon-copy:before{content:"\f0c5";} -.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6";} -.icon-save:before{content:"\f0c7";} -.icon-sign-blank:before{content:"\f0c8";} -.icon-reorder:before{content:"\f0c9";} -.icon-list-ul:before{content:"\f0ca";} -.icon-list-ol:before{content:"\f0cb";} -.icon-strikethrough:before{content:"\f0cc";} -.icon-underline:before{content:"\f0cd";} -.icon-table:before{content:"\f0ce";} -.icon-magic:before{content:"\f0d0";} -.icon-truck:before{content:"\f0d1";} -.icon-pinterest:before{content:"\f0d2";} -.icon-pinterest-sign:before{content:"\f0d3";} -.icon-google-plus-sign:before{content:"\f0d4";} -.icon-google-plus:before{content:"\f0d5";} -.icon-money:before{content:"\f0d6";} -.icon-caret-down:before{content:"\f0d7";} -.icon-caret-up:before{content:"\f0d8";} -.icon-caret-left:before{content:"\f0d9";} -.icon-caret-right:before{content:"\f0da";} -.icon-columns:before{content:"\f0db";} -.icon-sort:before{content:"\f0dc";} -.icon-sort-down:before{content:"\f0dd";} -.icon-sort-up:before{content:"\f0de";} -.icon-envelope:before{content:"\f0e0";} -.icon-linkedin:before{content:"\f0e1";} -.icon-rotate-left:before,.icon-undo:before{content:"\f0e2";} -.icon-legal:before{content:"\f0e3";} -.icon-dashboard:before{content:"\f0e4";} -.icon-comment-alt:before{content:"\f0e5";} -.icon-comments-alt:before{content:"\f0e6";} -.icon-bolt:before{content:"\f0e7";} -.icon-sitemap:before{content:"\f0e8";} -.icon-umbrella:before{content:"\f0e9";} -.icon-paste:before{content:"\f0ea";} -.icon-lightbulb:before{content:"\f0eb";} -.icon-exchange:before{content:"\f0ec";} -.icon-cloud-download:before{content:"\f0ed";} -.icon-cloud-upload:before{content:"\f0ee";} -.icon-user-md:before{content:"\f0f0";} -.icon-stethoscope:before{content:"\f0f1";} -.icon-suitcase:before{content:"\f0f2";} -.icon-bell-alt:before{content:"\f0f3";} -.icon-coffee:before{content:"\f0f4";} -.icon-food:before{content:"\f0f5";} -.icon-file-text-alt:before{content:"\f0f6";} -.icon-building:before{content:"\f0f7";} -.icon-hospital:before{content:"\f0f8";} -.icon-ambulance:before{content:"\f0f9";} -.icon-medkit:before{content:"\f0fa";} -.icon-fighter-jet:before{content:"\f0fb";} -.icon-beer:before{content:"\f0fc";} -.icon-h-sign:before{content:"\f0fd";} -.icon-plus-sign-alt:before{content:"\f0fe";} -.icon-double-angle-left:before{content:"\f100";} -.icon-double-angle-right:before{content:"\f101";} -.icon-double-angle-up:before{content:"\f102";} -.icon-double-angle-down:before{content:"\f103";} -.icon-angle-left:before{content:"\f104";} -.icon-angle-right:before{content:"\f105";} -.icon-angle-up:before{content:"\f106";} -.icon-angle-down:before{content:"\f107";} -.icon-desktop:before{content:"\f108";} -.icon-laptop:before{content:"\f109";} -.icon-tablet:before{content:"\f10a";} -.icon-mobile-phone:before{content:"\f10b";} -.icon-circle-blank:before{content:"\f10c";} -.icon-quote-left:before{content:"\f10d";} -.icon-quote-right:before{content:"\f10e";} -.icon-spinner:before{content:"\f110";} -.icon-circle:before{content:"\f111";} -.icon-mail-reply:before,.icon-reply:before{content:"\f112";} -.icon-github-alt:before{content:"\f113";} -.icon-folder-close-alt:before{content:"\f114";} -.icon-folder-open-alt:before{content:"\f115";} -.icon-expand-alt:before{content:"\f116";} -.icon-collapse-alt:before{content:"\f117";} -.icon-smile:before{content:"\f118";} -.icon-frown:before{content:"\f119";} -.icon-meh:before{content:"\f11a";} -.icon-gamepad:before{content:"\f11b";} -.icon-keyboard:before{content:"\f11c";} -.icon-flag-alt:before{content:"\f11d";} -.icon-flag-checkered:before{content:"\f11e";} -.icon-terminal:before{content:"\f120";} -.icon-code:before{content:"\f121";} -.icon-reply-all:before{content:"\f122";} -.icon-mail-reply-all:before{content:"\f122";} -.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123";} -.icon-location-arrow:before{content:"\f124";} -.icon-crop:before{content:"\f125";} -.icon-code-fork:before{content:"\f126";} -.icon-unlink:before{content:"\f127";} -.icon-question:before{content:"\f128";} -.icon-info:before{content:"\f129";} -.icon-exclamation:before{content:"\f12a";} -.icon-superscript:before{content:"\f12b";} -.icon-subscript:before{content:"\f12c";} -.icon-eraser:before{content:"\f12d";} -.icon-puzzle-piece:before{content:"\f12e";} -.icon-microphone:before{content:"\f130";} -.icon-microphone-off:before{content:"\f131";} -.icon-shield:before{content:"\f132";} -.icon-calendar-empty:before{content:"\f133";} -.icon-fire-extinguisher:before{content:"\f134";} -.icon-rocket:before{content:"\f135";} -.icon-maxcdn:before{content:"\f136";} -.icon-chevron-sign-left:before{content:"\f137";} -.icon-chevron-sign-right:before{content:"\f138";} -.icon-chevron-sign-up:before{content:"\f139";} -.icon-chevron-sign-down:before{content:"\f13a";} -.icon-html5:before{content:"\f13b";} -.icon-css3:before{content:"\f13c";} -.icon-anchor:before{content:"\f13d";} -.icon-unlock-alt:before{content:"\f13e";} -.icon-bullseye:before{content:"\f140";} -.icon-ellipsis-horizontal:before{content:"\f141";} -.icon-ellipsis-vertical:before{content:"\f142";} -.icon-rss-sign:before{content:"\f143";} -.icon-play-sign:before{content:"\f144";} -.icon-ticket:before{content:"\f145";} -.icon-minus-sign-alt:before{content:"\f146";} -.icon-check-minus:before{content:"\f147";} -.icon-level-up:before{content:"\f148";} -.icon-level-down:before{content:"\f149";} -.icon-check-sign:before{content:"\f14a";} -.icon-edit-sign:before{content:"\f14b";} -.icon-external-link-sign:before{content:"\f14c";} -.icon-share-sign:before{content:"\f14d";} -.icon-compass:before{content:"\f14e";} -.icon-collapse:before{content:"\f150";} -.icon-collapse-top:before{content:"\f151";} -.icon-expand:before{content:"\f152";} -.icon-euro:before,.icon-eur:before{content:"\f153";} -.icon-gbp:before{content:"\f154";} -.icon-dollar:before,.icon-usd:before{content:"\f155";} -.icon-rupee:before,.icon-inr:before{content:"\f156";} -.icon-yen:before,.icon-jpy:before{content:"\f157";} -.icon-renminbi:before,.icon-cny:before{content:"\f158";} -.icon-won:before,.icon-krw:before{content:"\f159";} -.icon-bitcoin:before,.icon-btc:before{content:"\f15a";} -.icon-file:before{content:"\f15b";} -.icon-file-text:before{content:"\f15c";} -.icon-sort-by-alphabet:before{content:"\f15d";} -.icon-sort-by-alphabet-alt:before{content:"\f15e";} -.icon-sort-by-attributes:before{content:"\f160";} -.icon-sort-by-attributes-alt:before{content:"\f161";} -.icon-sort-by-order:before{content:"\f162";} -.icon-sort-by-order-alt:before{content:"\f163";} -.icon-thumbs-up:before{content:"\f164";} -.icon-thumbs-down:before{content:"\f165";} -.icon-youtube-sign:before{content:"\f166";} -.icon-youtube:before{content:"\f167";} -.icon-xing:before{content:"\f168";} -.icon-xing-sign:before{content:"\f169";} -.icon-youtube-play:before{content:"\f16a";} -.icon-dropbox:before{content:"\f16b";} -.icon-stackexchange:before{content:"\f16c";} -.icon-instagram:before{content:"\f16d";} -.icon-flickr:before{content:"\f16e";} -.icon-adn:before{content:"\f170";} -.icon-bitbucket:before{content:"\f171";} -.icon-bitbucket-sign:before{content:"\f172";} -.icon-tumblr:before{content:"\f173";} -.icon-tumblr-sign:before{content:"\f174";} -.icon-long-arrow-down:before{content:"\f175";} -.icon-long-arrow-up:before{content:"\f176";} -.icon-long-arrow-left:before{content:"\f177";} -.icon-long-arrow-right:before{content:"\f178";} -.icon-apple:before{content:"\f179";} -.icon-windows:before{content:"\f17a";} -.icon-android:before{content:"\f17b";} -.icon-linux:before{content:"\f17c";} -.icon-dribbble:before{content:"\f17d";} -.icon-skype:before{content:"\f17e";} -.icon-foursquare:before{content:"\f180";} -.icon-trello:before{content:"\f181";} -.icon-female:before{content:"\f182";} -.icon-male:before{content:"\f183";} -.icon-gittip:before{content:"\f184";} -.icon-sun:before{content:"\f185";} -.icon-moon:before{content:"\f186";} -.icon-archive:before{content:"\f187";} -.icon-bug:before{content:"\f188";} -.icon-vk:before{content:"\f189";} -.icon-weibo:before{content:"\f18a";} -.icon-renren:before{content:"\f18b";} diff --git a/app/src/main/webapp/themes/gaurav/css/style.css b/app/src/main/webapp/themes/gaurav/css/style.css index 05c40e23c2..0a91e1c1bc 100755 --- a/app/src/main/webapp/themes/gaurav/css/style.css +++ b/app/src/main/webapp/themes/gaurav/css/style.css @@ -2,6 +2,11 @@ body { padding-top: 50px; } +/* Icons from Bootstrap Icons 1.13.2 (MIT), https://icons.getbootstrap.com/ */ +svg.bi { + vertical-align: -0.125em; +} + /* CONTENT - MAIN */ .dayTitle { @@ -15,24 +20,24 @@ body { a.permalink { padding: 2px 0px 2px 20px; - background: url('../icons/icon_clock.gif') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23b8862b' viewBox='0 0 16 16'%3E%3Cpath d='M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z'/%3E%3Cpath d='M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } a.tagLink { padding: 2px 0px 2px 20px; - background: url('../icons/tag_blue.png') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%233a87ad' viewBox='0 0 16 16'%3E%3Cpath d='M6 4.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-1 0a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0'/%3E%3Cpath d='M2 1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 1 6.586V2a1 1 0 0 1 1-1m0 5.586 7 7L13.586 9l-7-7H2z'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } a.commentslink { padding: 2px 0px 2px 20px; - background: url('../icons/comment.gif') left center no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%234a90d9' viewBox='0 0 16 16'%3E%3Cpath d='M14 1a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H4.414A2 2 0 0 0 3 11.586l-2 2V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12.793a.5.5 0 0 0 .854.353l2.853-2.853A1 1 0 0 1 4.414 12H14a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z'/%3E%3C/svg%3E") left center no-repeat; font-weight: normal; } ul.presentationLinks li { list-style-type: none; list-style-position: outside; - list-style-image: url('../icons/page_white_acrobat.png'); + list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23c9302c' viewBox='0 0 16 16'%3E%3Cpath d='M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2M9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5z'/%3E%3Cpath d='M4.603 14.087a.8.8 0 0 1-.438-.42c-.195-.388-.13-.776.08-1.102.198-.307.526-.568.897-.787a7.7 7.7 0 0 1 1.482-.645 20 20 0 0 0 1.062-2.227 7.3 7.3 0 0 1-.43-1.295c-.086-.4-.119-.796-.046-1.136.075-.354.274-.672.65-.823.192-.077.4-.12.602-.077a.7.7 0 0 1 .477.365c.088.164.12.356.127.538.007.188-.012.396-.047.614-.084.51-.27 1.134-.52 1.794a11 11 0 0 0 .98 1.686 5.8 5.8 0 0 1 1.334.05c.364.066.734.195.96.465.12.144.193.32.2.518.007.192-.047.382-.138.563a1.04 1.04 0 0 1-.354.416.86.86 0 0 1-.51.138c-.331-.014-.654-.196-.933-.417a5.7 5.7 0 0 1-.911-.95 11.7 11.7 0 0 0-1.997.406 11.3 11.3 0 0 1-1.02 1.51c-.292.35-.609.656-.927.787a.8.8 0 0 1-.58.029m1.379-1.901q-.25.115-.459.238c-.328.194-.541.383-.647.547-.094.145-.096.25-.04.361q.016.032.026.044l.035-.012c.137-.056.355-.235.635-.572a8 8 0 0 0 .45-.606m1.64-1.33a13 13 0 0 1 1.01-.193 12 12 0 0 1-.51-.858 21 21 0 0 1-.5 1.05zm2.446.45q.226.245.435.41c.24.19.407.253.498.256a.1.1 0 0 0 .07-.015.3.3 0 0 0 .094-.125.44.44 0 0 0 .059-.2.1.1 0 0 0-.026-.063c-.052-.062-.2-.152-.518-.209a4 4 0 0 0-.612-.053zM8.078 7.8a7 7 0 0 0 .2-.828q.046-.282.038-.465a.6.6 0 0 0-.032-.198.5.5 0 0 0-.145.04c-.087.035-.158.106-.196.283-.04.192-.03.469.046.822q.036.167.09.346z'/%3E%3C/svg%3E"); padding: 0.5em 0 0 0; margin: 0 0 0 0; } @@ -76,7 +81,7 @@ ul.presentationLinks li { #sidebar_content li.entryLink { padding: 0.5em 0 0 0; list-style-position: outside; - list-style-image: url('../icons/page_white.png'); + list-style-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23777' viewBox='0 0 16 16'%3E%3Cpath d='M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5z'/%3E%3C/svg%3E"); } ul.activities { margin-left: 1em; diff --git a/app/src/main/webapp/themes/gaurav/day.vm b/app/src/main/webapp/themes/gaurav/day.vm index 81ca909996..3b4887aaeb 100755 --- a/app/src/main/webapp/themes/gaurav/day.vm +++ b/app/src/main/webapp/themes/gaurav/day.vm @@ -15,7 +15,7 @@

by $entry.creator.screenName

-

Posted on $utils.formatDate($day, $text.get("macro.weblog.date.toStringFormat")) at $utils.formatDate($entry.pubTime, $text.get("macro.weblog.time.toStringFormat")) in $entry.category.name

+

Posted on $utils.formatDate($day, $text.get("macro.weblog.date.toStringFormat")) at $utils.formatDate($entry.pubTime, $text.get("macro.weblog.time.toStringFormat")) in $entry.category.name

@@ -24,7 +24,7 @@ #else #if($utils.isNotEmpty($entry.summary))

$entry.summary

- Read More + Read More #else

$entry.displayContent

#end diff --git a/app/src/main/webapp/themes/gaurav/entry.vm b/app/src/main/webapp/themes/gaurav/entry.vm index 7437d8213b..764b1a04b2 100755 --- a/app/src/main/webapp/themes/gaurav/entry.vm +++ b/app/src/main/webapp/themes/gaurav/entry.vm @@ -224,24 +224,20 @@ - - - - diff --git a/app/src/main/webapp/themes/gaurav/font/FontAwesome.otf b/app/src/main/webapp/themes/gaurav/font/FontAwesome.otf deleted file mode 100755 index 70125459f7..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/font/FontAwesome.otf and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.eot b/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.eot deleted file mode 100755 index 0662cb96bf..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.eot and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.svg b/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.svg deleted file mode 100755 index 2edb4ec34c..0000000000 --- a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.svg +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.ttf b/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.ttf deleted file mode 100755 index d365924691..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.ttf and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.woff b/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.woff deleted file mode 100755 index b9bd17e158..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/font/fontawesome-webfont.woff and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/comment.gif b/app/src/main/webapp/themes/gaurav/icons/comment.gif deleted file mode 100755 index 897cf2e3e4..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/comment.gif and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/delicious.gif b/app/src/main/webapp/themes/gaurav/icons/delicious.gif deleted file mode 100755 index 6b384a270a..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/delicious.gif and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/digman.gif b/app/src/main/webapp/themes/gaurav/icons/digman.gif deleted file mode 100755 index f76ed6a41c..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/digman.gif and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/facebook-logo.png b/app/src/main/webapp/themes/gaurav/icons/facebook-logo.png deleted file mode 100755 index 9c8ac3b500..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/facebook-logo.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/feed-icon-14x14.png b/app/src/main/webapp/themes/gaurav/icons/feed-icon-14x14.png deleted file mode 100755 index b3c949d224..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/feed-icon-14x14.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/feed-icon-28x28.png b/app/src/main/webapp/themes/gaurav/icons/feed-icon-28x28.png deleted file mode 100755 index d64c669c75..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/feed-icon-28x28.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/flickr-icon.png b/app/src/main/webapp/themes/gaurav/icons/flickr-icon.png deleted file mode 100755 index 0f4d05035e..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/flickr-icon.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/icon_clock.gif b/app/src/main/webapp/themes/gaurav/icons/icon_clock.gif deleted file mode 100755 index 6ac6ebca25..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/icon_clock.gif and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/linkedin-logo.jpg b/app/src/main/webapp/themes/gaurav/icons/linkedin-logo.jpg deleted file mode 100755 index 277790c36e..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/linkedin-logo.jpg and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/page_white.png b/app/src/main/webapp/themes/gaurav/icons/page_white.png deleted file mode 100755 index 3103c929e7..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/page_white.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/page_white_acrobat.png b/app/src/main/webapp/themes/gaurav/icons/page_white_acrobat.png deleted file mode 100755 index bedd6267ff..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/page_white_acrobat.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/slashdot-13x13.png b/app/src/main/webapp/themes/gaurav/icons/slashdot-13x13.png deleted file mode 100755 index a9fc4d2e21..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/slashdot-13x13.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/tag_blue.png b/app/src/main/webapp/themes/gaurav/icons/tag_blue.png deleted file mode 100755 index b5ba31f961..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/tag_blue.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/technorati-16x15.png b/app/src/main/webapp/themes/gaurav/icons/technorati-16x15.png deleted file mode 100755 index 787e218d35..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/technorati-16x15.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/icons/twitter-icon.png b/app/src/main/webapp/themes/gaurav/icons/twitter-icon.png deleted file mode 100755 index 38c7060532..0000000000 Binary files a/app/src/main/webapp/themes/gaurav/icons/twitter-icon.png and /dev/null differ diff --git a/app/src/main/webapp/themes/gaurav/js/search-highlight.js b/app/src/main/webapp/themes/gaurav/js/search-highlight.js new file mode 100644 index 0000000000..c580c948ab --- /dev/null +++ b/app/src/main/webapp/themes/gaurav/js/search-highlight.js @@ -0,0 +1,118 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. The ASF licenses this file to You + * under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +/* + * Highlights the words of a search in the search results page. + * + * The page marks the element that holds the results with a + * data-search-term attribute. Each word of the term found in the text under + * that element is wrapped in , which the page + * styles. Only text nodes are read and new nodes created, so the term is + * never parsed as markup. + */ +(function () { + 'use strict'; + + // Elements whose text is not shown as page content + var SKIPPED = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'TITLE']; + + // Lucene query operators, which are not words to look for + var OPERATORS = ['AND', 'OR', 'NOT', 'TO']; + + function wordsOf(term) { + var words = []; + term.split(/\s+/).forEach(function (raw) { + // Drop query syntax around a word: +required, -excluded, + // "phrases", (groups) and wildcards + var word = raw.replace(/^[+\-!("]+/, '').replace(/[)"*?~^]+$/, ''); + if (word && OPERATORS.indexOf(word) < 0) { + var lower = word.toLowerCase(); + if (words.indexOf(lower) < 0) { + words.push(lower); + } + } + }); + // Longest first, so that a longer word wins where words overlap + return words.sort(function (a, b) { return b.length - a.length; }); + } + + function escapeForRegExp(text) { + return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + } + + function textNodesUnder(root) { + var nodes = []; + var walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, null); + var node; + while ((node = walker.nextNode())) { + var parent = node.parentNode; + if (SKIPPED.indexOf(parent.nodeName) < 0 && parent.className !== 'searchword') { + nodes.push(node); + } + } + return nodes; + } + + function highlight(root, words) { + var pattern = new RegExp(words.map(escapeForRegExp).join('|'), 'gi'); + + textNodesUnder(root).forEach(function (node) { + var text = node.nodeValue; + var pieces = null; + var start = 0; + var match; + + pattern.lastIndex = 0; + while ((match = pattern.exec(text)) !== null) { + pieces = pieces || document.createDocumentFragment(); + if (match.index > start) { + pieces.appendChild(document.createTextNode(text.substring(start, match.index))); + } + var span = document.createElement('span'); + span.className = 'searchword'; + span.appendChild(document.createTextNode(match[0])); + pieces.appendChild(span); + start = pattern.lastIndex; + } + + if (pieces) { + if (start < text.length) { + pieces.appendChild(document.createTextNode(text.substring(start))); + } + node.parentNode.replaceChild(pieces, node); + } + }); + } + + function run() { + var results = document.querySelector('[data-search-term]'); + if (!results) { + return; + } + var words = wordsOf(results.getAttribute('data-search-term') || ''); + if (words.length > 0) { + highlight(results, words); + } + } + + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', run); + } else { + run(); + } +}()); diff --git a/app/src/main/webapp/themes/gaurav/js/searchhi.js b/app/src/main/webapp/themes/gaurav/js/searchhi.js deleted file mode 100755 index 901bc600cb..0000000000 --- a/app/src/main/webapp/themes/gaurav/js/searchhi.js +++ /dev/null @@ -1,112 +0,0 @@ -/* http://www.kryogenix.org/code/browser/searchhi/ */ -/* Modified 20021006 to fix query string parsing and add case insensitivity */ -/* Modified 20070316 to stop highlighting inside nosearchhi nodes */ -/* Modified 20081217 to do in-page searching and wrap up in an object */ -/* Modified 20081218 to scroll to first hit like - http://www.woolyss.free.fr/js/searchhi_Woolyss.js and say when not found */ - -var searchhi = { - highlightWord: function(node,word) { - // Iterate into this nodes childNodes - if (node.hasChildNodes) { - for (var hi_cn=0;hi_cn span.searchword { background-color:yellow; } - - - + #end - +
@@ -50,7 +38,7 @@ $text.get( "macro.weblog.searchhits", [$model.term, $model.hits]) #if ($model.hits > 0) -
+
#showNextPrevSearchControl($pager) #set($pager = $model.getWeblogEntriesPager()) #showWeblogEntriesPager($pager) diff --git a/app/src/main/webapp/themes/gaurav/std_head.vm b/app/src/main/webapp/themes/gaurav/std_head.vm index ec5bf81e8e..022a7e7aa5 100755 --- a/app/src/main/webapp/themes/gaurav/std_head.vm +++ b/app/src/main/webapp/themes/gaurav/std_head.vm @@ -10,4 +10,3 @@ - diff --git a/app/src/main/webapp/themes/gaurav/std_header.vm b/app/src/main/webapp/themes/gaurav/std_header.vm index 51eee6feef..6245b0548b 100755 --- a/app/src/main/webapp/themes/gaurav/std_header.vm +++ b/app/src/main/webapp/themes/gaurav/std_header.vm @@ -10,7 +10,7 @@
- +
@@ -77,7 +77,7 @@
del.icio.us + Bookmark itsubmit to dig digg.com + Digg it
slashdot + Slashdot ittechnorati + See who links to it