diff --git a/org.adempiere.server/idempiere.html b/org.adempiere.server/idempiere.html index 416a0278ce..17a6decffd 100644 --- a/org.adempiere.server/idempiere.html +++ b/org.adempiere.server/idempiere.html @@ -10,58 +10,6 @@ - @@ -115,49 +63,6 @@ End If - - @@ -224,7 +129,7 @@ Start iDempiere via RUN_Adempiere - © Copyright 2013 iDempiere - All rights reserved - iDempiere License is GPLv2 + © Copyright 2019 iDempiere - All rights reserved - iDempiere License is GPLv2 diff --git a/org.adempiere.server/idempiere.jsp b/org.adempiere.server/idempiere.jsp index f4b7c199a8..1b9bab8377 100644 --- a/org.adempiere.server/idempiere.jsp +++ b/org.adempiere.server/idempiere.jsp @@ -12,11 +12,6 @@ Author URI: http://www.bmlaurus.com - <% if(Prop.isRssOn()){ - out.write("\n"); - out.write(""); - } - %> <%=Prop.getProperty(Prop.TITLE) %> @@ -80,28 +75,6 @@ Author URI: http://www.bmlaurus.com -
-
- - <% if(Prop.isRssOn()) - out.write("

"+Prop.getProperty(Prop.RSS_REFRESH)+"

"); - %> -
-
" border="0" /> @@ -144,7 +117,7 @@ Author URI: http://www.bmlaurus.com
- " border="0"/> + " border="0"/>
diff --git a/org.adempiere.server/resources/gfeedfetcher.js b/org.adempiere.server/resources/gfeedfetcher.js deleted file mode 100644 index 7d1fa4f5cc..0000000000 --- a/org.adempiere.server/resources/gfeedfetcher.js +++ /dev/null @@ -1,119 +0,0 @@ -// ------------------------------------------------------------------- -// gAjax RSS Feeds Displayer- By Dynamic Drive, available at: http://www.dynamicdrive.com -// Created: July 17th, 2007 -// Updated June 14th, 10': Fixed issue in IE where labels would sometimes be associated with the incorrect feed items -// ------------------------------------------------------------------- - -var gfeedfetcher_loading_image="resources/indicator.gif" //Full URL to "loading" image. No need to config after this line!! - -google.load("feeds", "1") //Load Google Ajax Feed API (version 1) - -function gfeedfetcher(divid, divClass, linktarget){ - this.linktarget=linktarget || "" //link target of RSS entries - this.feedlabels=[] //array holding lables for each RSS feed - this.feedurls=[] - this.feeds=[] //array holding combined RSS feeds' entries from Feed API (result.feed.entries) - this.feedsfetched=0 //number of feeds fetched - this.feedlimit=5 - this.showoptions="" //Optional components of RSS entry to show (none by default) - this.sortstring="date" //sort by "date" by default - document.write('
') //output div to contain RSS entries - this.feedcontainer=document.getElementById(divid) - this.itemcontainer="
  • " //default element wrapping around each RSS entry item -} - -gfeedfetcher.prototype.addFeed=function(label, url){ - this.feedlabels[this.feedlabels.length]=label - this.feedurls[this.feedurls.length]=url -} - -gfeedfetcher.prototype.filterfeed=function(feedlimit, sortstr){ - this.feedlimit=feedlimit - if (typeof sortstr!="undefined") - this.sortstring=sortstr -} - -gfeedfetcher.prototype.displayoptions=function(parts){ - this.showoptions=parts //set RSS entry options to show ("date, datetime, time, snippet, label, description") -} - -gfeedfetcher.prototype.setentrycontainer=function(containerstr){ //set element that should wrap around each RSS entry item -this.itemcontainer="<"+containerstr.toLowerCase()+">" -} - -gfeedfetcher.prototype.init=function(){ - this.feedsfetched=0 //reset number of feeds fetched to 0 (in case init() is called more than once) - this.feeds=[] //reset feeds[] array to empty (in case init() is called more than once) - this.feedcontainer.innerHTML='

    Retrieving RSS feed(s)

    ' - var displayer=this - for (var i=0; i0 && this.feedlimit>this.feedurls.length && i==this.feedurls.length-1) //If this is the last RSS feed, and feedlimit/feedurls.length yields a remainder - items_to_show+=(this.feedlimit%this.feedurls.length) //Add that remainder to the number of entries to show for last RSS feed - feedpointer.setNumEntries(items_to_show) //set number of items to display - feedpointer.load(function(label){ - return function(r){ - displayer._fetch_data_as_array(r, label) - } - }(this.feedlabels[i])) //call Feed.load() to retrieve and output RSS feed. - } -} - - -gfeedfetcher._formatdate=function(datestr, showoptions){ - var itemdate=new Date(datestr) - var parseddate=(showoptions.indexOf("datetime")!=-1)? itemdate.toLocaleString() : (showoptions.indexOf("date")!=-1)? itemdate.toLocaleDateString() : (showoptions.indexOf("time")!=-1)? itemdate.toLocaleTimeString() : "" - return ""+parseddate+"" -} - -gfeedfetcher._sortarray=function(arr, sortstr){ - var sortstr=(sortstr=="label")? "ddlabel" : sortstr //change "label" string (if entered) to "ddlabel" instead, for internal use - if (sortstr=="title" || sortstr=="ddlabel"){ //sort array by "title" or "ddlabel" property of RSS feed entries[] - arr.sort(function(a,b){ - var fielda=a[sortstr].toLowerCase() - var fieldb=b[sortstr].toLowerCase() - return (fieldafieldb)? 1 : 0 - }) - } - else{ //else, sort by "publishedDate" property (using error handling, as "publishedDate" may not be a valid date str if an error has occured while getting feed - try{ - arr.sort(function(a,b){return new Date(b.publishedDate)-new Date(a.publishedDate)}) - } - catch(err){} - } -} - -gfeedfetcher.prototype._fetch_data_as_array=function(result, ddlabel){ - var thisfeed=(!result.error)? result.feed.entries : "" //get all feed entries as a JSON array or "" if failed - if (thisfeed==""){ //if error has occured fetching feed - alert("Some blog posts could not be loaded: "+result.error.message) - } - for (var i=0; i")? "    " : "" - this.feedcontainer.innerHTML=rssoutput -} - diff --git a/org.adempiere.server/resources/indicator.gif b/org.adempiere.server/resources/indicator.gif deleted file mode 100644 index 6bdefde949..0000000000 Binary files a/org.adempiere.server/resources/indicator.gif and /dev/null differ diff --git a/org.adempiere.server/resources/templates/black/images/img_back.jpg b/org.adempiere.server/resources/templates/black/images/img_back.jpg new file mode 100644 index 0000000000..fae345e28d Binary files /dev/null and b/org.adempiere.server/resources/templates/black/images/img_back.jpg differ diff --git a/org.adempiere.server/resources/templates/black/images/img_back.png b/org.adempiere.server/resources/templates/black/images/img_back.png deleted file mode 100644 index 4b07479adf..0000000000 Binary files a/org.adempiere.server/resources/templates/black/images/img_back.png and /dev/null differ diff --git a/org.adempiere.server/resources/templates/white/images/img_back.jpg b/org.adempiere.server/resources/templates/white/images/img_back.jpg new file mode 100644 index 0000000000..5ca17fe579 Binary files /dev/null and b/org.adempiere.server/resources/templates/white/images/img_back.jpg differ diff --git a/org.adempiere.server/resources/templates/white/images/img_back.png b/org.adempiere.server/resources/templates/white/images/img_back.png deleted file mode 100644 index e0abcf3399..0000000000 Binary files a/org.adempiere.server/resources/templates/white/images/img_back.png and /dev/null differ diff --git a/org.adempiere.server/resources/templates/white/images/img_webui.png b/org.adempiere.server/resources/templates/white/images/img_webui.png index 670949c6ae..ce85dd9552 100644 Binary files a/org.adempiere.server/resources/templates/white/images/img_webui.png and b/org.adempiere.server/resources/templates/white/images/img_webui.png differ diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java index e5dd67b137..b52fe885f1 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java @@ -24,7 +24,7 @@ public final class Prop implements Serializable { * @author BMLaurus-acanaveral * @uri http://www.bmlaurus.com */ - private static final long serialVersionUID = -3973931828485013352L; + private static final long serialVersionUID = -2735243406793760873L; /** File Property */ public static final String HOME_PROPERTY_FILE = "home.properties"; @@ -89,23 +89,8 @@ public final class Prop implements Serializable { public static final String SOC_6 = "Social6"; public static final String SOC_7 = "Social7"; - /** RSS Properties */ - public static final String RSS_ON = "rssOn"; - public static final String RSS = "rss"; - public static final String RSS_1_NAME = "rss1Name"; - public static final String RSS_1 = "rss1"; - public static final String RSS_2_NAME = "rss2Name"; - public static final String RSS_2 = "rss2"; - public static final String RSS_3_NAME = "rss3Name"; - public static final String RSS_3 = "rss3"; - public static final String RSS_4_NAME = "rss4Name"; - public static final String RSS_4 = "rss4"; - public static final String RSS_5_NAME = "rss5Name"; - public static final String RSS_5 = "rss5"; - public static final String RSS_REFRESH = "RssRefreshMessage"; - /**Defaults*/ - private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 3.0 Page!"; + private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page!"; private static String LOGO_URL = null; @@ -173,8 +158,6 @@ public final class Prop implements Serializable { s_prop.setProperty(CLIENT_NAME, "iDempiere Server"); if(s_prop.getProperty(CREDITS_TXT)==null||s_prop.getProperty(CREDITS_TXT).length()<=0) s_prop.setProperty(CREDITS_TXT, CREDITS); - if(s_prop.getProperty(RSS_REFRESH)==null||s_prop.getProperty(RSS_REFRESH).length()<=0) - s_prop.setProperty(RSS_REFRESH, "Refresh live blog posts"); //LINKS if(s_prop.getProperty(FELIX_LINK)==null||s_prop.getProperty(FELIX_LINK).length()<=0) s_prop.setProperty(FELIX_LINK, DEF_FELIX_LINK); @@ -320,15 +303,6 @@ public final class Prop implements Serializable { return bais.toByteArray(); } - public static boolean isRssOn(){ - boolean rss=false; - if(getProperty(RSS_ON).toUpperCase().equals("TRUE")|| - getProperty(RSS_ON).toUpperCase().equals("YES")|| - getProperty(RSS_ON).toUpperCase().equals("Y")) - rss=true; - return rss; - } - public static void load(){ loadProperties(getFileName(false)); setDefaults(); diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties index e470128395..ba7ae59708 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties @@ -11,7 +11,7 @@ IrcLink = http://webchat.freenode.net/?channels=idempiere WikiLink = http://wiki.idempiere.org/ ForumsLink = http://groups.google.com/group/idempiere SupportRequestLink = http://jira.idempiere.com -SupportLink = mailto:support@idempiere.com +SupportLink = mailto:idempiere@googlegroups.com OptionLink = https://idempiere.atlassian.net #Default Texts @@ -32,7 +32,7 @@ SupportRequestText = Support Request Facebook = https://www.facebook.com/IDempiere Twitter = https://twitter.com/iDempiere LinkedIn = NONE -Google+ = https://groups.google.com/forum/#!forum/idempiere-dev +Google+ = https://plus.google.com/communities/107237178393636704520 Social5 = NONE Social6 = NONE Social7 = NONE @@ -41,7 +41,7 @@ Social7 = NONE Title = iDempiere Application Home #Custom TemplateName (white or black) -TemplateName = black +TemplateName = white #file:///Linux/&Mac/resources/templates/ --- file://Windows/resources/templates/ TemplatePath = resources/templates/ @@ -54,11 +54,3 @@ ClientName = iDempiere Server #Custom Credits & Copyright tail Credits = Welcome to the iDempiere (OSGi+ADempiere) 6.1 Page! Copyriright = || by iDempiere Community - -#Custom RSS (rss1 to rss5) -rssOn = true -RssRefreshMessage = Refresh -rss1Name = iDempiere's Blog -rss1 = https://groups.google.com/group/idempiere/feed/rss_v2_0_msgs.xml -rss2Name = 2 nd Blog -rss2 = https://groups.google.com/group/idempiere-es/feed/rss_v2_0_msgs.xml