trying to fix the new styles which are all broke to hell!!!!
removed convertCarriageReturns from article added two of the new content items for 7
This commit is contained in:
parent
8e219cdc75
commit
ac15407a7e
14 changed files with 373 additions and 354 deletions
|
|
@ -57,11 +57,6 @@ ID of a tempate from the Article namespace to display the contents of the Articl
|
|||
|
||||
The text displayed to the user as a hyperlink to the linkURL.
|
||||
|
||||
=item convertCarriageReturns
|
||||
|
||||
A boolean. If set to true, all newlines will be converted to Break tags so that simple
|
||||
text will come out formatted as paragraphs.
|
||||
|
||||
=back
|
||||
|
||||
=cut
|
||||
|
|
@ -125,15 +120,6 @@ sub definition {
|
|||
hoverHelp=>$i18n->get('link title description'),
|
||||
uiLevel=>3
|
||||
},
|
||||
convertCarriageReturns=>{
|
||||
tab=>"display",
|
||||
fieldType=>'yesNo',
|
||||
defaultValue=>0,
|
||||
label=>$i18n->get(10),
|
||||
subtext=>' <span style="font-size: 8pt;">'.$i18n->get(11).'</span>',
|
||||
hoverHelp=>$i18n->get('carriage return description'),
|
||||
uiLevel=>5
|
||||
},
|
||||
storageId=>{
|
||||
tab=>"properties",
|
||||
fieldType=>"image",
|
||||
|
|
@ -239,7 +225,7 @@ sub prepareView {
|
|||
|
||||
sub purge {
|
||||
my $self = shift;
|
||||
my $sth = $self->session->db->read("select storageId from Articlewhere assetId=?",[$self->getId]);
|
||||
my $sth = $self->session->db->read("select storageId from Article where assetId=?",[$self->getId]);
|
||||
while (my ($storageId) = $sth->array) {
|
||||
my $storage = WebGUI::Storage::Image->get($self->session,$storageId);
|
||||
$storage->delete if defined $storage;
|
||||
|
|
@ -308,9 +294,6 @@ sub view {
|
|||
}
|
||||
}
|
||||
$var{description} = $self->get("description");
|
||||
if ($self->get("convertCarriageReturns")) {
|
||||
$var{description} =~ s/\n/\<br \/\>\n/g;
|
||||
}
|
||||
$var{"new.template"} = $self->getUrl.";overrideTemplateId=";
|
||||
$var{"description.full"} = $var{description};
|
||||
$var{"description.full"} =~ s/\^\-\;//g;
|
||||
|
|
|
|||
|
|
@ -27,12 +27,6 @@ our $HELP = {
|
|||
namespace => 'Asset_Article',
|
||||
uiLevel => 3,
|
||||
},
|
||||
{
|
||||
title => '10',
|
||||
description => 'carriage return description',
|
||||
namespace => 'Asset_Article',
|
||||
uiLevel => 5,
|
||||
},
|
||||
],
|
||||
related => [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,11 +21,6 @@ our $I18N = {
|
|||
lastUpdated => 0
|
||||
},
|
||||
|
||||
'11' => {
|
||||
message => q|(Select "Yes" only if you aren't adding <br> manually.)|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'71' => {
|
||||
message => q|<P>Articles are the Swiss Army knife of WebGUI. Most pieces of static content can be added via the Article. Articles are Wobjects, so they inherit the properties of both Wobjects and Assets.
|
||||
<P>
|
||||
|
|
@ -234,17 +229,6 @@ The URL to view the replies to this article.
|
|||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'10' => {
|
||||
message => q|Convert carriage returns?|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'carriage return description' => {
|
||||
message => q|
|
||||
If you're publishing HTML there's generally no need to check this option, but if you aren't using HTML and you want a carriage return every place you hit your "Enter" key, then check this option.|,
|
||||
lastUpdated => 1119066524
|
||||
},
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue