added a bunch of style functions
This commit is contained in:
parent
264287a0fb
commit
759dfd2f6b
22 changed files with 75 additions and 36 deletions
|
|
@ -16,7 +16,7 @@ use WebGUI::URL;
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub process {
|
||||
if ($session{env}{QUERY_STRING} =~ /op/ || $session{env}{QUERY_STRING} =~ /func/) {
|
||||
if ($session{form}{op} || $session{form}{func}) {
|
||||
return '<a href="'.WebGUI::URL::page().'">'.$session{page}{title}.'</a>';
|
||||
} else {
|
||||
return $session{page}{title};
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ use WebGUI::Utility;
|
|||
sub process {
|
||||
my ($temp, @param, $styleId);
|
||||
@param = WebGUI::Macro::getParams($_[0]);
|
||||
$temp = WebGUI::URL::append($session{env}{REQUEST_URI},'makePrintable=1');
|
||||
$temp = WebGUI::URL::append($session{env}{REQUEST_URI},'op=makePrintable');
|
||||
if ($param[1] ne "") {
|
||||
($styleId) = WebGUI::SQL->quickArray("select styleId from style where name=".quote($param[1]));
|
||||
if ($styleId != 0) {
|
||||
$temp = WebGUI::URL::append($temp,'style='.$styleId);
|
||||
$temp = WebGUI::URL::append($temp,'styleId='.$styleId);
|
||||
}
|
||||
}
|
||||
if ($param[0] ne "linkonly") {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ use WebGUI::Operation::Scratch;
|
|||
use WebGUI::Operation::Search;
|
||||
use WebGUI::Operation::Settings;
|
||||
use WebGUI::Operation::Statistics;
|
||||
use WebGUI::Operation::Style;
|
||||
use WebGUI::Operation::Template;
|
||||
use WebGUI::Operation::Theme;
|
||||
use WebGUI::Operation::Trash;
|
||||
|
|
|
|||
|
|
@ -217,17 +217,9 @@ sub www_editGroup {
|
|||
-value=>$g->autoDelete,
|
||||
-label=>WebGUI::International::get(975)
|
||||
);
|
||||
my %databaseLinkOptions;
|
||||
tie %databaseLinkOptions, 'Tie::IxHash',
|
||||
"0"=>WebGUI::International::get(19,'SQLReport'),
|
||||
WebGUI::DatabaseLink::getHash();
|
||||
$f->selectList(
|
||||
-name=>"databaseLinkId",
|
||||
-options=>\%databaseLinkOptions,
|
||||
-label=>WebGUI::International::get(20,'SQLReport'),
|
||||
-value=>[$g->databaseLinkId],
|
||||
-subtext=>(WebGUI::Privilege::isInGroup(3)) ? '<a href="'.WebGUI::URL::page("op=listDatabaseLinks").'">'.WebGUI::International::get(981).'</a>' : ""
|
||||
);
|
||||
$f->databaseLink(
|
||||
-value=>[$g->databaseLinkId]
|
||||
);
|
||||
$f->textarea(
|
||||
-name=>"dbQuery",
|
||||
-value=>$g->dbQuery,
|
||||
|
|
|
|||
|
|
@ -74,7 +74,8 @@ sub _recursePageTree {
|
|||
hideFromNavigation,
|
||||
newWindow,
|
||||
cacheTimeout,
|
||||
cacheTimeoutVisitor
|
||||
cacheTimeoutVisitor,
|
||||
printableStyleId
|
||||
) values (
|
||||
$newPageId,
|
||||
$_[1],
|
||||
|
|
@ -101,7 +102,8 @@ sub _recursePageTree {
|
|||
$package{hideFromNavigation},
|
||||
$package{newWindow},
|
||||
$package{cacheTimeout},
|
||||
$package{cacheTimeoutVisitor}
|
||||
$package{cacheTimeoutVisitor},
|
||||
$package{printableStyleId}
|
||||
)");
|
||||
_recursePageTree($package{pageId},$newPageId);
|
||||
}
|
||||
|
|
@ -111,6 +113,7 @@ sub _recursePageTree {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_selectPackageToDeploy {
|
||||
my ($output, %data, $sth, $flag);
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
if (WebGUI::Privilege::canEditPage()) {
|
||||
tie %data,'Tie::CPHash';
|
||||
$output = helpIcon(30);
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ sub _recursivelyChangeStyle {
|
|||
$sth = WebGUI::SQL->read("select pageId from page where parentId=$_[0]");
|
||||
while (($pageId) = $sth->array) {
|
||||
if (WebGUI::Privilege::canEditPage($pageId)) {
|
||||
WebGUI::SQL->write("update page set styleId=$session{form}{styleId} where pageId=$pageId");
|
||||
WebGUI::SQL->write("update page set styleId=$session{form}{styleId}, printableStyleId=$session{form}{printableStyleId} where pageId=$pageId");
|
||||
_recursivelyChangeStyle($pageId);
|
||||
}
|
||||
}
|
||||
|
|
@ -248,6 +248,7 @@ use WebGUI::TabForm;
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editPage {
|
||||
my ($f, $endDate, $output, $subtext, $childCount, %hash, %page);
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
tie %hash, "Tie::IxHash";
|
||||
tie %page, "Tie::CPHash";
|
||||
if (WebGUI::Privilege::canEditPage($session{form}{npp})) {
|
||||
|
|
@ -318,7 +319,7 @@ sub www_editPage {
|
|||
-value=>$page{urlizedTitle},
|
||||
-uiLevel=>3
|
||||
);
|
||||
$f->getTab("properties")->select(
|
||||
$f->getTab("properties")->selectList(
|
||||
-name=>"languageId",
|
||||
-label=>WebGUI::International::get(304),
|
||||
-value=>[$page{languageId}],
|
||||
|
|
@ -365,17 +366,17 @@ sub www_editPage {
|
|||
-unitsValue=>$data[1],
|
||||
-uiLevel=>8
|
||||
);
|
||||
if (WebGUI::Privilege::isInGroup(5)) {
|
||||
$subtext = ' <a href="'.WebGUI::URL::page('op=listStyles')
|
||||
.'">'.WebGUI::International::get(6).'</a>';
|
||||
} else {
|
||||
$subtext = "";
|
||||
}
|
||||
$f->getTab("layout")->template(
|
||||
-name=>"styleId",
|
||||
-label=>WebGUI::International::get(105),
|
||||
-value=>$page{styleId},
|
||||
-subtext=>$subtext,
|
||||
-label=>WebGUI::International::get(912),
|
||||
-value=>($page{styleId} || 2),
|
||||
-namespace=>'style',
|
||||
-uiLevel=>5
|
||||
);
|
||||
$f->getTab("layout")->template(
|
||||
-name=>"printableStyleId",
|
||||
-label=>WebGUI::International::get(1079),
|
||||
-value=>($page{printableStyleId} || 3),
|
||||
-namespace=>'style',
|
||||
-uiLevel=>5
|
||||
);
|
||||
|
|
@ -494,6 +495,7 @@ sub www_editPageSave {
|
|||
WebGUI::SQL->write("update page set
|
||||
title=".quote($session{form}{title}).",
|
||||
styleId=$session{form}{styleId},
|
||||
printableStyleId=$session{form}{printableStyleId},
|
||||
ownerId=$session{form}{ownerId},
|
||||
groupIdView=$session{form}{groupIdView},
|
||||
groupIdEdit=$session{form}{groupIdEdit},
|
||||
|
|
@ -604,6 +606,7 @@ sub www_pastePage {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_viewPageTree {
|
||||
my ($output);
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
$output = '<h1>'.WebGUI::International::get(448).'</h1>';
|
||||
$output .= _traversePageTree(0,0);
|
||||
return $output;
|
||||
|
|
|
|||
|
|
@ -128,6 +128,17 @@ sub www_editMiscSettings {
|
|||
},
|
||||
-label=>WebGUI::International::get(1069)
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"useAdminStyle",
|
||||
-value=>$session{setting}{useAdminStyle},
|
||||
-label=>WebGUI::International::get(1080)
|
||||
);
|
||||
$f->template(
|
||||
-name=>"adminStyleId",
|
||||
-namespace=>"style",
|
||||
-value=>$session{setting}{adminStyleId},
|
||||
-label=>WebGUI::International::get(1081)
|
||||
);
|
||||
$f->submit;
|
||||
$output .= $f->print;
|
||||
return _submenu($output);
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ our @EXPORT = qw(&menuWrapper);
|
|||
#-------------------------------------------------------------------
|
||||
sub menuWrapper {
|
||||
my ($output, $key);
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
$output = '<table width="100%" border="0" cellpadding="5" cellspacing="0">
|
||||
<tr><td width="70%" class="tableData" valign="top">';
|
||||
$output .= $_[0];
|
||||
|
|
|
|||
|
|
@ -180,9 +180,9 @@ sub www_viewStatistics {
|
|||
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(794).':</td><td class="tableData">'.$data.'</td></tr>';
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from wobject where wobjectId > 0 and pageId<>3");
|
||||
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(148).':</td><td class="tableData">'.$data.'</td></tr>';
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from style where styleId>1000");
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000 and namespace='style'");
|
||||
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>';
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000");
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000 and namespace<>'style'");
|
||||
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';
|
||||
($data) = WebGUI::SQL->quickArray("select count(*) from collateral");
|
||||
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>';
|
||||
|
|
|
|||
|
|
@ -89,6 +89,13 @@ sub process {
|
|||
my %var;
|
||||
$var{'body.content'} = shift;
|
||||
my $templateId = shift;
|
||||
if ($session{page}{makePrintable}) {
|
||||
$templateId = $session{page}{printableStyleId};
|
||||
} elsif ($session{page}{useAdminStyle} ne "" && $session{setting}{useAdminStyle}) {
|
||||
$templateId = $session{setting}{adminStyleId};
|
||||
} elsif ($session{scratch}{personalStyleId} ne "") {
|
||||
$templateId = $session{scratch}{personalStyleId};
|
||||
}
|
||||
my $type = lc($session{setting}{siteicon});
|
||||
$type =~ s/.*\.(.*?)$/$1/;
|
||||
$var{'head.tags'} = '
|
||||
|
|
|
|||
|
|
@ -1165,6 +1165,7 @@ An id this namespace of the WebGUI international system. This message will be re
|
|||
|
||||
sub www_edit {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($self, @p) = @_;
|
||||
my ($properties, $layout, $privileges, $heading, $helpId, $headingId) =
|
||||
rearrange([qw(properties layout privileges heading helpId headingId)], @p);
|
||||
|
|
|
|||
|
|
@ -453,6 +453,7 @@ sub www_editSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editField {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, %field, $f, %fieldStatus);
|
||||
tie %field, 'Tie::CPHash';
|
||||
tie %fieldStatus, 'Tie::IxHash';
|
||||
|
|
|
|||
|
|
@ -318,6 +318,7 @@ sub www_editSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editEvent {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my (%recursEvery, $special, $output, $f, %event);
|
||||
tie %event, 'Tie::CPHash';
|
||||
tie %recursEvery, 'Tie::IxHash';
|
||||
|
|
|
|||
|
|
@ -184,6 +184,7 @@ sub www_editSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editDownload {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $file, $f);
|
||||
$file = $_[0]->getCollateral("FileManager_file","FileManager_fileId",$session{form}{did});
|
||||
$output .= helpIcon(2,$_[0]->get("namespace"));
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ sub www_edit {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editForum {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my $forumMeta;
|
||||
if ($session{form}{forumId} ne "new") {
|
||||
$forumMeta = WebGUI::SQL->quickHashRef("select title,description from MessageBoard_forums where forumId=".$session{form}{forumId});
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ sub purge {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_addAccessory {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $f, $accessory, @usedAccessories);
|
||||
$output = helpIcon(4,$_[0]->get("namespace"));
|
||||
$output .= '<h1>'.WebGUI::International::get(16,$_[0]->get("namespace")).'</h1>';
|
||||
|
|
@ -137,6 +138,7 @@ sub www_addAccessory {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_addAccessorySave {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($seq);
|
||||
($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory
|
||||
where wobjectId=".$_[0]->get("wobjectId"));
|
||||
|
|
@ -326,6 +328,7 @@ sub www_editSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editBenefit {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $data, $f, $benefits);
|
||||
$data = $_[0]->getCollateral("Product_benefit","Product_benefitId",$session{form}{bid});
|
||||
$output = helpIcon(6,$_[0]->get("namespace"));
|
||||
|
|
@ -361,6 +364,7 @@ sub www_editBenefitSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editFeature {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $data, $f, $features);
|
||||
$data = $_[0]->getCollateral("Product_feature","Product_featureId",$session{form}{fid});
|
||||
$output = helpIcon(2,$_[0]->get("namespace"));
|
||||
|
|
@ -396,6 +400,7 @@ sub www_editFeatureSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editSpecification {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $data, $f, $hashRef);
|
||||
$data = $_[0]->getCollateral("Product_specification","Product_specificationId",$session{form}{sid});
|
||||
$output = helpIcon(3,$_[0]->get("namespace"));
|
||||
|
|
|
|||
|
|
@ -306,6 +306,7 @@ sub www_editSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editAnswer {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($question, $output, $f, $answer);
|
||||
$answer = $_[0]->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid});
|
||||
$output = '<h1>'.WebGUI::International::get(18,$_[0]->get("namespace")).'</h1>';
|
||||
|
|
@ -383,6 +384,7 @@ sub www_editAnswerSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editQuestion {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
|
||||
$session{page}{useAdminStyle} = 1;
|
||||
my ($output, $f, $question, $answerFieldType, $sth, %data);
|
||||
tie %data, 'Tie::CPHash';
|
||||
$question = $_[0]->getCollateral("Survey_question","Survey_questionId",$session{form}{qid});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue