Permalink
Browse files

PRESIDECMS-1225 Rebrand PresideCMS to Preside

  • Loading branch information...
Seb Duggan
Seb Duggan committed Apr 27, 2018
1 parent fc26e3f commit e32889cb1195b6d8b092dd9b24c67952f9cea3a4
Showing with 115 additions and 108 deletions.
  1. +10 −10 COPYRIGHT.txt
  2. +3 −3 README.md
  3. +4 −4 box.json
  4. +4 −4 box.json.no.deps
  5. +4 −4 build.sh
  6. +1 −1 support/tests/index.cfm
  7. +1 −1 support/tests/integration/api/email/EmailServiceTest.cfc
  8. +1 −1 system/Bootstrap.cfc
  9. +1 −1 system/assets/ckeditorExtensions/plugins/presidelink/plugin.js
  10. +8 −1 system/assets/css/admin/core/preside_ace_theme.less
  11. +1 −1 system/assets/css/admin/frontend/toolbar.less
  12. +1 −1 system/assets/css/admin/specific/login/loginLayout.less
  13. BIN system/assets/images/logos/logo-preside-admin-header.png
  14. BIN system/assets/images/logos/preside-logo-admin-header.png
  15. BIN system/assets/images/logos/preside-logo-for-login.png
  16. BIN system/assets/images/logos/preside-logo-login.png
  17. +1 −1 system/handlers/admin/devtools/terminalCommands/Cache.cfc
  18. +1 −1 system/handlers/email/serviceProvider/Smtp.cfc
  19. +1 −1 system/handlers/email/template/CmsWelcome.cfc
  20. +1 −1 system/handlers/email/template/Notification.cfc
  21. +1 −1 system/handlers/email/template/ResetCmsPassword.cfc
  22. +1 −1 system/i18n/applications.properties
  23. +1 −1 system/i18n/applications_de.properties
  24. +1 −1 system/i18n/applications_fr.properties
  25. +12 −12 system/i18n/cms.properties
  26. +12 −12 system/i18n/cms_de.properties
  27. +11 −11 system/i18n/cms_fr.properties
  28. +1 −1 system/i18n/email/layout/default.properties
  29. +1 −1 system/i18n/email/layout/default_de.properties
  30. +1 −1 system/i18n/storage-providers/filesystem.properties
  31. +1 −1 system/i18n/storage-providers/filesystem_de.properties
  32. +1 −1 system/migrations/downgrades/README.md
  33. +1 −1 system/migrations/upgrades/README.md
  34. +2 −2 system/services/PresideSuperClass.cfc
  35. +2 −2 system/services/assetManager/DocumentMetadataService.cfc
  36. +3 −3 system/services/configuration/InjectedConfigurationManager.cfc
  37. +1 −1 system/services/configuration/SystemConfigurationService.cfc
  38. +1 −1 system/services/devtools/scaffoldingResources/emailTemplateHandler.cfc.txt
  39. +2 −2 system/services/devtools/scaffoldingResources/extension.Config.cfc.txt
  40. +3 −3 system/services/email/EmailService.cfc
  41. +1 −1 system/services/errors/ErrorLogService.cfc
  42. +1 −1 system/services/features/FeatureService.cfc
  43. +1 −1 system/services/notifications/NotificationService.cfc
  44. +1 −1 system/services/passwordPolicy/PasswordPolicyValidator.cfc
  45. +2 −2 system/services/presideObjects/SqlSchemaSynchronizer.cfc
  46. +1 −1 system/services/rest/PresideRestService.cfc
  47. +1 −1 system/services/serverManager/PresideServerManagerApiClient.cfc
  48. +2 −2 system/services/updateManager/UpdateManagerService.cfc
  49. +2 −2 system/services/validation/ValidationEngine.cfc
  50. +1 −1 system/views/errors/sqlRebuild.cfm
@@ -1,20 +1,20 @@
The PresideCMS program and all source code is Copyright 2003-2014 Pixl8 Interactive Limited unless otherwise stated
The Preside program and all source code is Copyright 2003-2014 Pixl8 Interactive Limited unless otherwise stated
PresideCMS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2
Preside is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2
Special exception
Linking PresideCMS statically or dynamically with other modules constitutes the preparation of a derivative work based on
PresideCMS. Thus, the terms and conditions of the GNU General Public License version 2 ("GPL") cover the entire combined work.
Linking Preside statically or dynamically with other modules constitutes the preparation of a derivative work based on
Preside. Thus, the terms and conditions of the GNU General Public License version 2 ("GPL") cover the entire combined work.
The copyright holders of PresideCMS grant you permission to combine PresideCMS with programs
or libraries that are released under the GNU Lesser General Public License version 2.1.
The copyright holders of Preside grant you permission to combine Preside with programs
or libraries that are released under the GNU Lesser General Public License version 2.1.
In addition you may combine PresideCMS with other source code of your choice and distribute this without PresideCMS under the license of your choice, providing that you follow these specific guidelines:
In addition you may combine Preside with other source code of your choice and distribute this without Preside under the license of your choice, providing that you follow these specific guidelines:
You agree not to modify the PresideCMS logo or remove it from display anywhere within the software.
You agree not to remove notices within the PresideCMS software that reference the copyright holders
You agree not to remove credit links from the PresideCMS administrator, you may add addendums.
You agree not to modify the Preside logo or remove it from display anywhere within the software.
You agree not to remove notices within the Preside software that reference the copyright holders
You agree not to remove credit links from the Preside administrator, you may add addendums.
This program is distributed in the hope that it will be useful, but
@@ -1,13 +1,13 @@
PresideCMS
==========
Preside
=======
[![Build Status](https://travis-ci.org/pixl8/Preside-CMS.svg?branch=stable "Stable")](https://travis-ci.org/pixl8/Preside-CMS)
[![Slack Status](https://presidecms-slack.herokuapp.com/badge.svg)](https://presidecms-slack.herokuapp.com/)
[![GetBadges Game](https://pixl8-preside-cms.getbadges.io/shield/company/pixl8-preside-cms)](https://pixl8-preside-cms.getbadges.io/?ref=shield-game)
PresideCMS is an open source CMS for the [Lucee Server](http://lucee.org) built on the [ColdBox MVC Framework](http://www.coldbox.org). It is developed and maintained by [Pixl8 Interactive](http://www.pixl8.co.uk).
Preside is an open source CMS for the [Lucee Server](http://lucee.org) built on the [ColdBox MVC Framework](http://www.coldbox.org). It is developed and maintained by [Pixl8 Interactive](http://www.pixl8.co.uk).
[Website (https://www.preside.org)](https://www.preside.org)
@@ -4,21 +4,21 @@
"author":"Pixl8 Interactive",
"createPackageDirectory":true,
"packageDirectory":"preside",
"homepage":"https://www.presidecms.com",
"homepage":"https://www.preside.org",
"documentation":"https://docs.preside.org",
"repository":{
"type":"github",
"URL":"https://github.com/pixl8/Preside-CMS"
},
"bugs":"https://presidecms.atlassian.net",
"slug":"presidecms",
"shortDescription":"The PresideCMS platform by Pixl8 Interactive",
"shortDescription":"The Preside platform by Pixl8 Interactive",
"description":"",
"instructions":"https://docs.preside.org/quickstart.html",
"changelog":"https://www.presidecms.com/release-notes.html",
"changelog":"https://www.preside.org/release-notes.html",
"keywords":"CMS,ColdBox,FOSS",
"private":false,
"projectURL":"https://www.presidecms.com",
"projectURL":"https://www.preside.org",
"license":[
{
"type":"LGPLv2",
@@ -4,21 +4,21 @@
"author":"Pixl8 Interactive",
"createPackageDirectory":true,
"packageDirectory":"preside",
"homepage":"https://www.presidecms.com",
"homepage":"https://www.preside.org",
"documentation":"https://docs.preside.org",
"repository":{
"type":"github",
"URL":"https://github.com/pixl8/Preside-CMS"
},
"bugs":"https://presidecms.atlassian.net",
"slug":"presidecms",
"shortDescription":"The PresideCMS platform by Pixl8 Interactive",
"shortDescription":"The Preside platform by Pixl8 Interactive",
"description":"",
"instructions":"https://docs.preside.org/quickstart.html",
"changelog":"https://www.presidecms.com/release-notes.html",
"changelog":"https://www.preside.org/release-notes.html",
"keywords":"CMS,ColdBox,FOSS",
"private":false,
"projectURL":"https://www.presidecms.com",
"projectURL":"https://www.preside.org",
"license":[
{
"type":"LGPLv2",
@@ -4,17 +4,17 @@ cd `dirname $0`
CWD="`pwd`"
echo "";
echo "--------------------------------------------------------";
echo "Welcome to the PresideCMS Test runner and build suite :)";
echo "--------------------------------------------------------";
echo "-----------------------------------------------------";
echo "Welcome to the Preside Test runner and build suite :)";
echo "-----------------------------------------------------";
echo "";
echo "This script will install dependencies, run tests, and conditionally package preside into a ZIP file.";
echo "Each of these operations can be run independently with the following commands:";
echo "";
echo "box install - installs dependencies";
echo "cd system/assets/ && npm install && grunt all - builds static assets";
echo "./test.sh - runs tests";
echo "ant -f ./support/build/build.xml - packages PresideCMS into a zip file";
echo "ant -f ./support/build/build.xml - packages Preside into a zip file";
echo "";
echo "The script has dependencies on CommandBox, ant + an accessible database for running the test suite.";
echo "";
@@ -1,2 +1,2 @@
<h1>Welcome to PresideCMS test suite</h1>
<h1>Welcome to Preside test suite</h1>
<a href="runtests.cfm">Run the full suite now</a>
@@ -182,7 +182,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
emailService.send( to=[ "test@test.com" ], subject="Test subject", htmlBody="not really html" );
} catch( "EmailService.missingSender" e ) {
expect( e.message ?: "" ).toBe( "Missing from email address when sending message with subject [Test subject]" );
expect( e.detail ?: "" ).toBe( "Ensure that a default from email address is configured through your PresideCMS administrator" );
expect( e.detail ?: "" ).toBe( "Ensure that a default from email address is configured through your Preside administrator" );
errorThrown = true;
} catch( any e ){
fail( "Incorrect error thrown. Expected type [EmailService.missingSender] but error of type [#e.type#] was thrown instead with message [#e.message#]." );
@@ -221,7 +221,7 @@ component {
nullSupport = luceeCompilerSettings.nullSupport
templateCharset = luceeCompilerSettings.templateCharset;
} catch( security e ) {
throw( type="security", message="PresideCMS could not automatically update Lucee settings to ensure dot notation for structs preserves case (rather than the default behaviour of converting to uppercase). Please either allow open access to admin APIs or change the setting in Lucee server settings." );
throw( type="security", message="Preside could not automatically update Lucee settings to ensure dot notation for structs preserves case (rather than the default behaviour of converting to uppercase). Please either allow open access to admin APIs or change the setting in Lucee server settings." );
}
}
}
@@ -2,7 +2,7 @@
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*
* May 2014: This file has been lightly modified for the purposes of integrating with PresideCMS
* May 2014: This file has been lightly modified for the purposes of integrating with Preside
*/
'use strict';
@@ -7,7 +7,7 @@
width : 177px;
height : 45px;
text-indent : -9999px;
background : url( ../../../images/logos/logo-preside-admin-header.png ) no-repeat left center;
background : url( ../../../images/logos/preside-logo-admin-header.png ) no-repeat left center;
}
.site-picker {
@@ -99,6 +99,13 @@
}
}
}
> li.application-menu, > li.application-menu.open {
&:after {
display: none;
}
}
}
.nav-list>li.active:after {
@@ -19,7 +19,7 @@ html {
width : 177px;
height : 45px;
text-indent : -9999px;
background : url( ../../../images/logos/logo-preside-admin-header.png ) no-repeat left center;
background : url( ../../../images/logos/preside-logo-admin-header.png ) no-repeat left center;
float : left;
margin : 0;
}
@@ -23,7 +23,7 @@ html.presidecms {
.cms-brand {
height : 48px;
text-indent : -999em;
background : url( ../../../../images/logos/preside-logo-for-login.png ) no-repeat center center;
background : url( ../../../../images/logos/preside-logo-login.png ) no-repeat center center;
&.pulled-left {
background-position : left center;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -12,7 +12,7 @@ component hint="Interact with and report on system caches" {
if ( !params.len() || !ArrayFindNoCase( validOperations, params[1] ) ) {
return Chr(10) & "[[b;white;]Usage:] cache [operation]" & Chr(10) & Chr(10)
& "Valid operations:" & Chr(10) & Chr(10)
& " [[b;white;]stats] : Displays summary statistics of the PresideCMS caches." & Chr(10)
& " [[b;white;]stats] : Displays summary statistics of the Preside caches." & Chr(10)
& " [[b;white;]resetstats] : Resets hit, miss and other agreggated statistics to zero." & Chr(10)
}
@@ -68,7 +68,7 @@ component {
sendArgs.messageId = sendArgs.messageId ?: CreateUUId();
m.addParam( name="X-Mailer", value="PresideCMS" );
m.addParam( name="X-Mailer", value="Preside" );
m.addParam( name="X-Message-ID", value=sendArgs.messageId );
m.send();
@@ -28,7 +28,7 @@ component {
}
private string function defaultSubject() {
return "Welcome to PresideCMS";
return "Welcome to Preside";
}
private string function defaultHtmlBody() {
@@ -25,7 +25,7 @@ component {
params.notification_subject = Trim( notificationService.renderNotification( arguments.topic, arguments.data, "emailSubject" ) );
if ( !params.notification_subject.len() ) {
params.notification_subject = "PresideCMS: You have received a notification from the CMS";
params.notification_subject = "Preside: You have received a notification from the CMS";
}
return params;
@@ -21,7 +21,7 @@ component {
}
private string function defaultSubject() {
return "Reset your PresideCMS password";
return "Reset your Preside password";
}
private string function defaultHtmlBody() {
@@ -1,3 +1,3 @@
cms.title=PresideCMS: Content Management
cms.title=Preside: Content Management
cms.description=Manage sites, pages, assets and data
cms.iconclass=fa-globe
@@ -1,3 +1,3 @@
cms.title=PresideCMS\: Content Management
cms.title=Preside\: Content Management
cms.description=Bearbeiten Sie Sites, Seiten, Inhalte und Daten
cms.iconclass=fa-globe
@@ -1,3 +1,3 @@
cms.title=PresideCMS\: Gestion de contenu
cms.title=Preside\: Gestion de contenu
cms.description=G\u00E9rez des sites, pages, fichiers et donn\u00E9es
cms.iconclass=fa-globe
@@ -1,7 +1,7 @@
cms.title=PresideCMS
cms.title=Preside
cms.application.title=Content management
cms.version=Powered by PresideCMS v{1}
cms.git.branch=Powered by PresideCMS (local git branch: {1})
cms.version=Powered by Preside v{1}
cms.git.branch=Powered by Preside (local git branch: {1})
cms.tagline=Open Source CMS for Enterprise
home.title=Home
user.welcome=Welcome, {1}
@@ -493,7 +493,7 @@ frontendeditor.publish.prompt=Are you sure you want to publish this {1}? All dra
frontendeditor.publish.prompt.changed.fields.title=Changed fields:
frontendeditor.publish.not.required.alert=There are no changes to publish! The record is already published and up to date.
admintoolbar.title=PresideCMS
admintoolbar.title=Preside
admintoolbar.editmode=Quick edit
admintoolbar.edit.page=Full edit
admintoolbar.show.hide=Show / hide
@@ -879,11 +879,11 @@ sites.saved.confirmation=The site details were saved successfully
updateManager=System updates
updateManager.menu.title=Updates
updateManager.subtitle=Update and rollback your version of PresideCMS
updateManager.current.version.up.to.date=Congratulations! You are running the latest version of PresideCMS, {1}.
updateManager.current.version.unknown=We are unable to detect your current version of PresideCMS. This may be because you are running directly from source rather than from a built version of PresideCMS. If this is the case, please use source control for manually updating to the latest version.
updateManager.subtitle=Update and rollback your version of Preside
updateManager.current.version.up.to.date=Congratulations! You are running the latest version of Preside, {1}.
updateManager.current.version.unknown=We are unable to detect your current version of Preside. This may be because you are running directly from source rather than from a built version of Preside. If this is the case, please use source control for manually updating to the latest version.
updateManager.git.clone.message=You are running Preside from a local git clone (branch '{1}'). The update manager is unable to automatically update your version of preside through the UI. You should use GIT commands to control your version instead.
updateManager.latest.version.unknown=You are currently running PresideCMS version: {1}. However, we are unable to fetch details of the latest version of PresideCMS to check for updates.
updateManager.latest.version.unknown=You are currently running Preside version: {1}. However, we are unable to fetch details of the latest version of Preside to check for updates.
updateManager.latest.version.downloadable=An update is available to download. You are currently running version {1}. The latest version is {2} build on {3} & {4} availabe here.
updateManager.latest.version.downloading=Version {2} is now downloading. This page should auto refresh once download has completed. Please be patient! Your current active version is {1}.
updateManager.latest.version.installable=An update is available to install. You are currently running version {1}. The latest version is {2}.
@@ -900,10 +900,10 @@ updateManager.editSettings.breadCrumb=Settings
updateManager.editSettings.btn=Edit settings
updateManager.editSettings.subtitle=Manage update sources and update manager behaviour
updateManager.settings.saved.confirmation=System update settings saved successfully
updatemanager.download.version.not.found.error=Download unsuccessful. The PresideCMS version, [{1}], could not be found.
updatemanager.download.started.confirmation=Download of PresideCMS version [{1}] has begun. This page should auto refresh once the download has completed. Please be patient!
updatemanager.download.version.not.found.error=Download unsuccessful. The Preside version, [{1}], could not be found.
updatemanager.download.started.confirmation=Download of Preside version [{1}] has begun. This page should auto refresh once the download has completed. Please be patient!
updatemanager.installed.confirmation=Version {1} has been successfully installed
updatemanager.install.version.not.found.error=Install unsuccessful. The PresideCMS version, [{1}], could not be found.
updatemanager.install.version.not.found.error=Install unsuccessful. The Preside version, [{1}], could not be found.
updatemanager.install.lucee.admin.access.denied=Install unsuccessful. The system could not update mappings through the Lucee adminsitrator API. Either configure Lucee to allow open access to the cfadmin tag or enter your administrator password in the update manager settings screen.
updateManager.locally.downloaded.tab=Locally downloaded versions
updateManager.remotely.available.tab=Versions available from download servers
@@ -926,7 +926,7 @@ updateManager.download.error.message=There was an error downloading version {1}.
updateManager.download.in.progress=in progress...
systemInformation.menu.title=System Information
systemInformation.cms.th=PresideCMS
systemInformation.cms.th=Preside
systemInformation.applicationServer.th=Application Server
systemInformation.dataBase.th=Database Server
systemInformation.java.th=Java
Oops, something went wrong.

0 comments on commit e32889c

Please sign in to comment.