migrated WebGUI::Icon api to use new session
This commit is contained in:
parent
b3974c0cd5
commit
2735385050
33 changed files with 289 additions and 278 deletions
|
|
@ -43,12 +43,12 @@ sub appendPostListTemplateVars {
|
|||
foreach my $row (@$page) {
|
||||
my $post = WebGUI::Asset->new($row->{assetId}, $row->{className}, $row->{revisionDate});
|
||||
$post->{_parent} = $self; # caching parent for efficiency
|
||||
my $controls = deleteIcon('func=delete',$post->get("url"),"Delete").editIcon('func=edit',$post->get("url"));
|
||||
my $controls = $self->session->icon->delete('func=delete',$post->get("url"),"Delete").$self->session->icon->edit('func=edit',$post->get("url"));
|
||||
if ($self->get("sortBy") eq "lineage") {
|
||||
if ($self->get("sortOrder") eq "desc") {
|
||||
$controls .= moveUpIcon('func=demote',$post->get("url")).moveDownIcon('func=promote',$post->get("url"));
|
||||
$controls .= $self->session->icon->moveUp('func=demote',$post->get("url")).$self->session->icon->moveDown('func=promote',$post->get("url"));
|
||||
} else {
|
||||
$controls .= moveUpIcon('func=promote',$post->get("url")).moveDownIcon('func=demote',$post->get("url"));
|
||||
$controls .= $self->session->icon->moveUp('func=promote',$post->get("url")).$self->session->icon->moveDown('func=demote',$post->get("url"));
|
||||
}
|
||||
}
|
||||
my $inDateRange;
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ sub _fieldAdminIcons {
|
|||
my $tid = shift;
|
||||
my $cantDelete = shift;
|
||||
my $output;
|
||||
$output = deleteIcon('func=deleteFieldConfirm;fid='.$fid.';tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
|
||||
$output .= editIcon('func=editField;fid='.$fid.';tid='.$tid,$self->get("url"))
|
||||
.moveUpIcon('func=moveFieldUp;fid='.$fid.';tid='.$tid,$self->get("url"))
|
||||
.moveDownIcon('func=moveFieldDown;fid='.$fid.';tid='.$tid,$self->get("url"));
|
||||
$output = $self->session->icon->delete('func=deleteFieldConfirm;fid='.$fid.';tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
|
||||
$output .= $self->session->icon->edit('func=editField;fid='.$fid.';tid='.$tid,$self->get("url"))
|
||||
.$self->session->icon->moveUp('func=moveFieldUp;fid='.$fid.';tid='.$tid,$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveFieldDown;fid='.$fid.';tid='.$tid,$self->get("url"));
|
||||
return $output;
|
||||
}
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -103,10 +103,10 @@ sub _tabAdminIcons {
|
|||
my $tid = shift;
|
||||
my $cantDelete = shift;
|
||||
my $output;
|
||||
$output = deleteIcon('func=deleteTabConfirm;tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
|
||||
$output .= editIcon('func=editTab;tid='.$tid,$self->get("url"))
|
||||
.moveLeftIcon('func=moveTabLeft;tid='.$tid,$self->get("url"))
|
||||
.moveRightIcon('func=moveTabRight;tid='.$tid,$self->get("url"));
|
||||
$output = $self->session->icon->delete('func=deleteTabConfirm;tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
|
||||
$output .= $self->session->icon->edit('func=editTab;tid='.$tid,$self->get("url"))
|
||||
.$self->session->icon->moveLeft('func=moveTabLeft;tid='.$tid,$self->get("url"))
|
||||
.$self->session->icon->moveRight('func=moveTabRight;tid='.$tid,$self->get("url"));
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
|
@ -331,9 +331,9 @@ sub getListTemplateVars {
|
|||
push(@recordLoop,{
|
||||
"record.ipAddress"=>$record->{ipAddress},
|
||||
"record.edit.url"=>$self->getUrl("func=view;entryId=".$record->{DataForm_entryId}),
|
||||
"record.edit.icon"=>editIcon("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
|
||||
"record.edit.icon"=>$self->session->icon->edit("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
|
||||
"record.delete.url"=>$self->getUrl("func=deleteEntry;entryId=".$record->{DataForm_entryId}),
|
||||
"record.delete.icon"=>deleteIcon("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
|
||||
"record.delete.icon"=>$self->session->icon->delete("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
|
||||
"record.username"=>$record->{username},
|
||||
"record.userId"=>$record->{userId},
|
||||
"record.submissionDate.epoch"=>$record->{submissionDate},
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ sub view {
|
|||
}
|
||||
</style>
|
||||
');
|
||||
$vars{"dragger.icon"} = WebGUI::Icon::dragIcon();
|
||||
$vars{"dragger.icon"} = $self->session->icon->drag();
|
||||
$vars{"dragger.init"} = '
|
||||
<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->config->get("extrasURL").'/spacer.gif"></iframe>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ sub getToolbar {
|
|||
}
|
||||
my $toolbar;
|
||||
if (!$self->isLocked || $self->get("isLockedBy") eq $self->session->user->profileField("userId")) {
|
||||
$toolbar = editIcon('func=edit'.$returnUrl,$self->get("url"));
|
||||
$toolbar = $self->session->icon->edit('func=edit'.$returnUrl,$self->get("url"));
|
||||
}
|
||||
my $i18n = WebGUI::International->new("Asset");
|
||||
return '<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -757,10 +757,10 @@ sub view {
|
|||
$var{"addFeature.label"} = WebGUI::International::get(34,'Asset_Product');
|
||||
$sth = $self->session->db->read("select feature,Product_featureId from Product_feature where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
|
||||
while (%data = $sth->hash) {
|
||||
$segment = deleteIcon('func=deleteFeatureConfirm&fid='.$data{Product_featureId},$self->get("url"),WebGUI::International::get(3,'Asset_Product'))
|
||||
.editIcon('func=editFeature&fid='.$data{Product_featureId},$self->get("url"))
|
||||
.moveUpIcon('func=moveFeatureUp&&fid='.$data{Product_featureId},$self->get("url"))
|
||||
.moveDownIcon('func=moveFeatureDown&&fid='.$data{Product_featureId},$self->get("url"));
|
||||
$segment = $self->session->icon->delete('func=deleteFeatureConfirm&fid='.$data{Product_featureId},$self->get("url"),WebGUI::International::get(3,'Asset_Product'))
|
||||
.$self->session->icon->edit('func=editFeature&fid='.$data{Product_featureId},$self->get("url"))
|
||||
.$self->session->icon->moveUp('func=moveFeatureUp&&fid='.$data{Product_featureId},$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveFeatureDown&&fid='.$data{Product_featureId},$self->get("url"));
|
||||
push(@featureloop,{
|
||||
"feature.feature"=>$data{feature},
|
||||
"feature.controls"=>$segment
|
||||
|
|
@ -774,10 +774,10 @@ sub view {
|
|||
$var{"addBenefit.label"} = WebGUI::International::get(55,'Asset_Product');
|
||||
$sth = $self->session->db->read("select benefit,Product_benefitId from Product_benefit where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
|
||||
while (%data = $sth->hash) {
|
||||
$segment = deleteIcon('func=deleteBenefitConfirm&bid='.$data{Product_benefitId},$self->get("url"),WebGUI::International::get(48,'Asset_Product'))
|
||||
.editIcon('func=editBenefit&bid='.$data{Product_benefitId},$self->get("url"))
|
||||
.moveUpIcon('func=moveBenefitUp&bid='.$data{Product_benefitId},$self->get("url"))
|
||||
.moveDownIcon('func=moveBenefitDown&bid='.$data{Product_benefitId},$self->get("url"));
|
||||
$segment = $self->session->icon->delete('func=deleteBenefitConfirm&bid='.$data{Product_benefitId},$self->get("url"),WebGUI::International::get(48,'Asset_Product'))
|
||||
.$self->session->icon->edit('func=editBenefit&bid='.$data{Product_benefitId},$self->get("url"))
|
||||
.$self->session->icon->moveUp('func=moveBenefitUp&bid='.$data{Product_benefitId},$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveBenefitDown&bid='.$data{Product_benefitId},$self->get("url"));
|
||||
push(@benefitloop,{
|
||||
"benefit.benefit"=>$data{benefit},
|
||||
"benefit.controls"=>$segment
|
||||
|
|
@ -791,10 +791,10 @@ sub view {
|
|||
$var{"addSpecification.label"} = WebGUI::International::get(35,'Asset_Product');
|
||||
$sth = $self->session->db->read("select name,value,units,Product_specificationId from Product_specification where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
|
||||
while (%data = $sth->hash) {
|
||||
$segment = deleteIcon('func=deleteSpecificationConfirm&sid='.$data{Product_specificationId},$self->get("url"),WebGUI::International::get(5,'Asset_Product'))
|
||||
.editIcon('func=editSpecification&sid='.$data{Product_specificationId},$self->get("url"))
|
||||
.moveUpIcon('func=moveSpecificationUp&sid='.$data{Product_specificationId},$self->get("url"))
|
||||
.moveDownIcon('func=moveSpecificationDown&sid='.$data{Product_specificationId},$self->get("url"));
|
||||
$segment = $self->session->icon->delete('func=deleteSpecificationConfirm&sid='.$data{Product_specificationId},$self->get("url"),WebGUI::International::get(5,'Asset_Product'))
|
||||
.$self->session->icon->edit('func=editSpecification&sid='.$data{Product_specificationId},$self->get("url"))
|
||||
.$self->session->icon->moveUp('func=moveSpecificationUp&sid='.$data{Product_specificationId},$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveSpecificationDown&sid='.$data{Product_specificationId},$self->get("url"));
|
||||
push(@specificationloop,{
|
||||
"specification.controls"=>$segment,
|
||||
"specification.specification"=>$data{value},
|
||||
|
|
@ -812,9 +812,9 @@ sub view {
|
|||
where Product_accessory.assetId=".$self->session->db->quote($self->getId)."
|
||||
order by Product_accessory.sequenceNumber");
|
||||
while (my ($id) = $sth->array) {
|
||||
$segment = deleteIcon('func=deleteAccessoryConfirm&aid='.$id,$self->get("url"),WebGUI::International::get(2,'Asset_Product'))
|
||||
.moveUpIcon('func=moveAccessoryUp&aid='.$id,$self->get("url"))
|
||||
.moveDownIcon('func=moveAccessoryDown&aid='.$id,$self->get("url"));
|
||||
$segment = $self->session->icon->delete('func=deleteAccessoryConfirm&aid='.$id,$self->get("url"),WebGUI::International::get(2,'Asset_Product'))
|
||||
.$self->session->icon->moveUp('func=moveAccessoryUp&aid='.$id,$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveAccessoryDown&aid='.$id,$self->get("url"));
|
||||
my $accessory = WebGUI::Asset->newByDynamicClass($id);
|
||||
push(@accessoryloop,{
|
||||
"accessory.URL"=>$accessory->getUrl,
|
||||
|
|
@ -833,9 +833,9 @@ sub view {
|
|||
where Product_related.assetId=".$self->session->db->quote($self->getId)."
|
||||
order by Product_related.sequenceNumber");
|
||||
while (my ($id) = $sth->array) {
|
||||
$segment = deleteIcon('func=deleteRelatedConfirm&rid='.$id,$self->get("url"),WebGUI::International::get(4,'Asset_Product'))
|
||||
.moveUpIcon('func=moveRelatedUp&rid='.$id,$self->get("url"))
|
||||
.moveDownIcon('func=moveRelatedDown&rid='.$id,$self->get("url"));
|
||||
$segment = $self->session->icon->delete('func=deleteRelatedConfirm&rid='.$id,$self->get("url"),WebGUI::International::get(4,'Asset_Product'))
|
||||
.$self->session->icon->moveUp('func=moveRelatedUp&rid='.$id,$self->get("url"))
|
||||
.$self->session->icon->moveDown('func=moveRelatedDown&rid='.$id,$self->get("url"));
|
||||
my $related = WebGUI::Asset->newByDynamicClass($id);
|
||||
push(@relatedloop,{
|
||||
"relatedproduct.URL"=>$related->getUrl,
|
||||
|
|
|
|||
|
|
@ -625,10 +625,10 @@ sub view {
|
|||
while (my %data = $sth2->hash) {
|
||||
push(@edit,{
|
||||
'question.edit.controls'=>
|
||||
deleteIcon('func=deleteQuestionConfirm;qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
|
||||
editIcon('func=editQuestion;qid='.$data{Survey_questionId}, $self->get("url")).
|
||||
moveUpIcon('func=moveQuestionUp;qid='.$data{Survey_questionId}, $self->get("url")).
|
||||
moveDownIcon('func=moveQuestionDown;qid='.$data{Survey_questionId}, $self->get("url")),
|
||||
$self->session->icon->delete('func=deleteQuestionConfirm;qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
|
||||
$self->session->icon->edit('func=editQuestion;qid='.$data{Survey_questionId}, $self->get("url")).
|
||||
$self->session->icon->moveUp('func=moveQuestionUp;qid='.$data{Survey_questionId}, $self->get("url")).
|
||||
$self->session->icon->moveDown('func=moveQuestionDown;qid='.$data{Survey_questionId}, $self->get("url")),
|
||||
'question.edit.question'=>$data{question},
|
||||
'question.edit.id'=>$data{Survey_questionId}
|
||||
});
|
||||
|
|
@ -637,10 +637,10 @@ sub view {
|
|||
|
||||
push(@sectionEdit,{
|
||||
'section.edit.controls'=>
|
||||
deleteIcon('func=deleteSectionConfirm;sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
|
||||
editIcon('func=editSection;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
|
||||
moveUpIcon('func=moveSectionUp;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
|
||||
moveDownIcon('func=moveSectionDown;sid='.$sectionData{Survey_sectionId}, $self->get("url")),
|
||||
$self->session->icon->delete('func=deleteSectionConfirm;sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
|
||||
$self->session->icon->edit('func=editSection;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
|
||||
$self->session->icon->moveUp('func=moveSectionUp;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
|
||||
$self->session->icon->moveDown('func=moveSectionDown;sid='.$sectionData{Survey_sectionId}, $self->get("url")),
|
||||
'section.edit.sectionName'=>$sectionData{sectionName},
|
||||
'section.edit.id'=>$sectionData{Survey_sectionId},
|
||||
'section.questions_loop'=>\@edit
|
||||
|
|
@ -973,11 +973,11 @@ sub www_editQuestion {
|
|||
where Survey_questionId=".$self->session->db->quote($question->{Survey_questionId})." order by sequenceNumber");
|
||||
while (%data = $sth->hash) {
|
||||
$output .=
|
||||
deleteIcon('func=deleteAnswerConfirm;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId},
|
||||
$self->session->icon->delete('func=deleteAnswerConfirm;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId},
|
||||
$self->get("url"),WebGUI::International::get(45,'Asset_Survey')).
|
||||
editIcon('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
moveUpIcon('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
moveDownIcon('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
$self->session->icon->edit('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
$self->session->icon->moveUp('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
$self->session->icon->moveDown('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
|
||||
' '.$data{answer}.'<br />';
|
||||
}
|
||||
$sth->finish;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue