[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [6116] Remove old non-XHTML desk item component.
From: mroch () bricolage ! cc
Date: 2004-12-27 1:08:36
Message-ID: 20041227010836.10031.qmail () x1 ! develooper ! com
[Download RAW message or body]
Revision: 6116
Author: mroch
Date: 2004-12-26 17:08:34 -0800 (Sun, 26 Dec 2004)
ViewCVS: http://viewsvn.bricolage.cc/?rev=6116&view=rev
Log Message:
-----------
Remove old non-XHTML desk item component.
Added Files:
-----------
bricolage/branches/dev_cssify/inst/upgrade/1.9.0/delete_old_desk_component.pl
Removed Files:
-------------
bricolage/branches/dev_cssify/comp/widgets/desk/desk_item_old.html
["r6116-mroch.diff" (r6116-mroch.diff)]
Deleted: bricolage/branches/dev_cssify/comp/widgets/desk/desk_item_old.html
===================================================================
--- bricolage/branches/dev_cssify/comp/widgets/desk/desk_item_old.html 2004-12-26 \
21:52:05 UTC (rev 6115)
+++ bricolage/branches/dev_cssify/comp/widgets/desk/desk_item_old.html 2004-12-27 \
01:08:34 UTC (rev 6116) @@ -1,259 +0,0 @@
-%#-- Begin HTML --#
-
-<%once>
-
-# outputs a 1x1 pixel table cell. The first argument determines value of the
-# colspan tag, while the second determines the height of the image.
-my $onePixCell = sub {
- my ($colspan, $h, $w) = @_;
- $h ||= 1;
- $w ||= 1;
- $colspan = $colspan ? qq{ colspan="$colspan"} : '';
- return qq {<td width="1"$colspan bgcolor="white">} .
- qq{<img src="/media/images/spacer.gif" width="$w" height="$h" /></td>};
-};
-
-</%once>
-
-<table border="0" width="580" cellpadding="0" cellspacing="0">
-<tr>
- <td><img src="/media/images/spacer.gif" width="58" height="18" /></td>
- <td><img src="/media/images/spacer.gif" width="1" height="10" /></td>
- <td><img src="/media/images/spacer.gif" width="38" height="10" /></td>
- <td><img src="/media/images/spacer.gif" width="1" height="10" /></td>
- <td><img src="/media/images/spacer.gif" width="443" height="10" /></td>
- <td><img src="/media/images/spacer.gif" width="18" height="10" /></td>
-</tr>
-<tr class="<% $header_class %>">
- <td <% $classes->{id} || '' %> align="right"><span class="label"><% $id \
%></span> </td>
- <% &$onePixCell(0, 22) %>
- <td align="center"><span class="label">V.<% $obj->get_version %></span></td>
- <% &$onePixCell() %>
- <td <% $classes->{name} || $classes->{file_name} || '' %>> <span \
class="label"><% $name %></span></td>
- <td <% $classes->{name} || $classes->{file_name} || '' %>><% $status %></td>
-</tr>
-</table>
-
-<table border="0" width="580" cellpadding="0" cellspacing="0">
-<tr>
-<% &$onePixCell(undef, 1, 100) %>
-<% &$onePixCell(2, 1, 241) %>
-<td rowspan="<% ($rowspan * 2) %>" width="1" class="medHeader"><img \
src="/media/images/spacer.gif" width="1" height="1" /></td>
-<% &$onePixCell(1) %>
-<td rowspan="<% ($rowspan * 2) %>" width="1" class="medHeader"><img \
src="/media/images/spacer.gif" width="1" height="1" /></td>
-</tr>
-<tr>
- <td align="right" class="medHeader" width="100"><%$lang->maketext('Category')%>: \
</td>
- <td width="1"><img src="/media/images/spacer.gif" width="1" height="20" /></td>
- <td<% $classes->{category_name} || $classes->{location} || '' %> \
width="240"> <span class="subHeader"><% $cat %></span></td>
- <td rowspan="<% ($rowspan * 2 - 1) %>" width="237">
- <table border="0" width="237" celpadding="0" cellspacing="0">
- <tr>
- <% &$onePixCell(0, 20) %>
- <td><% $lang->maketext($elink) %></td>
- <tr>
- <% &$onePixCell(0, 43) %>
- <td>
-% if ($can_edit && $desk_opts) {
- <% $mlabel %>: <& '/widgets/profile/select.mc',
- name => $widget . '|next_desk',
- value => $desk_val,
- options => $desk_opts,
- useTable => 0 &>
-% } else {
-
-% }
- </td>
- </tr>
- <tr>
- <% &$onePixCell(0, 18) %>
- <td>
-<%perl>;
-my $link = $ppage . '/' . $aid;
-my $item_label = 'Trail';
-my $item_url = "/workflow/trail/$class/$aid";
-if ($desk_type eq 'workflow') {
- $link .= '?return=' . $did;
- if ($vlabel eq 'Edit') {
- $link .= '&checkout=1';
- }
-} else {
- if ($vlabel eq 'Edit') {
- $link .= '?checkout=1';
- }
- if ($class eq 'story') {
- $item_label = 'Clone';
-# $item_url = $r->uri . "?$widget|clone_cb=$aid";
- $item_url = "/workflow/profile/workspace/clone/$aid";
- }
-}
-</%perl>
- <a href="<% $ppage . '/' . lc $vlabel %>_notes.html?id=<% $aid %>" \
class="blackUnderlinedLink"><%$lang->maketext('Notes')%></a>
- <a href="<% $item_url %>" class="blackUnderlinedLink"><% \
$lang->maketext($item_label) %></a>
- <a href="<% $link %>" class="blackUnderlinedLink"><% \
$lang->maketext($vlabel) %></a>
- <a href="/workflow/events/<% $class %>/<% $aid %>" \
class="blackUnderlinedLink"><%$lang->maketext('Log')%></a>
- <% $pub %>
- </td>
- </tr>
- </table>
- </td>
-
-</tr>
-
-<tr>
-<% &$onePixCell(3) %>
-</tr>
-<tr>
- <td align="right" class="medHeader"><%$lang->maketext('Site')%>: </td>
- <% &$onePixCell(0, 18) %>
- <td<% $classes->{priority} || '' %>> <span class="subHeader"><% $site || \
' ' %></span></td>
-</tr>
-
-
-<tr>
-<% &$onePixCell(3) %>
-</tr>
-
-<tr>
- <td align="right" class="medHeader"><% $lang->maketext($class eq 'formatting' ? \
'Output Channel' : "$disp Type") %>: </td>
- <% &$onePixCell(0, 20) %>
- <td<% $classes->{element} || '' %>> <span class="subHeader"><% $type \
%></span></td>
-</tr>
-<tr>
-<% &$onePixCell(3) %>
-</tr>
-
-<tr>
- <td align="right" class="medHeader"><% $lang->maketext($date_label) || ' ' \
%>: </td>
- <% &$onePixCell(0, 20) %>
- <td<% $classes->{cover_date} || '' %>> <span class="subHeader"><% $date || \
' ' %></span></td>
-</tr>
-<tr>
-<% &$onePixCell(3) %>
-</tr>
-<tr>
- <td align="right" class="medHeader"><%$lang->maketext('Priority')%>: </td>
- <% &$onePixCell(0, 18) %>
- <td<% $classes->{priority} || '' %>> <span class="subHeader"><% \
$lang->maketext($priors->{$obj->get_priority}) || ' ' \
%></span></td>
-</tr>
-<tr>
-<td colspan="6" width="1" class="medHeader"><img src="/media/images/spacer.gif" \
width="1" height="1"></td>
-</tr>
-</table>
-
-%#-- End HTML --#
-
-%#-- Once Section --#
-<%once>;
-my $priors = Bric::Biz::Asset->list_priorities;
-</%once>
-
-%#-- Args Section --#
-<%args>
-$mlabel => 'Move to Desk'
-$widget => 'desk_asset'
-$obj
-$highlight
-$can_edit
-$vlabel => 'View'
-$desk_val
-$desk_opts
-$ppage
-$disp
-$type
-$pub => ''
-$aid
-$class => 'story'
-$did
-$desk_type
-$user => undef
-$label => undef
-$action => undef
-</%args>
-
-%#-- Init Section --#
-<%init>;
-# Get the ID.
-my $id = $obj->get_id;
-
-# Determine the status.
-my $status = $m->comp('publish_status.mc', asset => $obj) || ' ';
-
-my $cats = $r->pnotes("desk.cats") || {};
-my ($name, $date, $date_label, $cat);
-my $header_class = 'lightHeader';
-
-my $site_id = $obj->get_site_id;
-my $site = Bric::Biz::Site->lookup({id => $site_id})->get_name || ' ';
-
-if ($class eq 'formatting') {
- $date = $obj->get_deploy_date || ' ';
- $date_label = 'Deployed Date';
- $name = $obj->get_uri;
- my $cat_id = $obj->get_category_id;
- if (defined $cat_id) {
- unless ($cat = $cats->{$cat_id}) {
- $cat = Bric::Biz::Category->lookup({ id => $cat_id })->get_uri;
- $cats->{$cat_id} = $cat;
- $r->pnotes("desk.cats", $cats);
- }
- } else {
- $cat = ' ';
- }
-} else {
- $name = $obj->get_name;
- $date = $obj->get_cover_date;
- $date_label = 'Cover Date';
- my $co = $vlabel eq 'Edit';
- my $c = $highlight eq 'name' ? 'whiteMedUnderlinedLink'
- : 'blackMedUnderlinedLink';
- if ($class eq 'media') {
- $cat = $cats->{$obj->get_category__id} ||= $obj->get_category_object;
- $cat = $cat->get_uri if $cat;
- $name = $m->comp('/widgets/profile/preview_link.mc',
- type => $class,
- style => $c,
- doc => $obj,
- title => $name )
- if $obj->get_file_name;
- } else {
- $cat = $obj->get_primary_category;
- $cat = $cat->get_uri if $cat;
- $cat ||= ' ';
- $name = $m->comp('/widgets/profile/preview_link.mc',
- type => $class,
- style => $c,
- doc => $obj,
- title => $name );
- }
- $header_class = 'aliasHeader' if $obj->get_alias_id;
-}
-$cat ||= ' ';
-my $classes = $highlight ? { $highlight => ' class="tealHighlight"' } : {};
-my $rowspan = 5;
-
-my $elink = $user ? $user : $label ? qq{<a href="} . $r->uri . "?" .
- join('&', ("$widget|$action=$aid", "$widget|asset_class=$class"))
- . qq{" class=blackUnderlinedLink>$label</a>} : '';
-</%init>
-
-<%doc>
-###############################################################################
-
-=head1 NAME
-
-/widgets/desk/desk_item.html - Desk Item Presentation.
-
-=head1 VERSION
-
-$LastChangedRevision$
-
-=head1 DATE
-
-$LastChangedDate$
-
-=head1 DESCRIPTION
-
-This element handles the display of individual assets on a desk or workspace.
-
-</%doc>
Added: bricolage/branches/dev_cssify/inst/upgrade/1.9.0/delete_old_desk_component.pl
===================================================================
--- bricolage/branches/dev_cssify/inst/upgrade/1.9.0/delete_old_desk_component.pl 2004-12-26 \
21:52:05 UTC (rev 6115)
+++ bricolage/branches/dev_cssify/inst/upgrade/1.9.0/delete_old_desk_component.pl 2004-12-27 \
01:08:34 UTC (rev 6116) @@ -0,0 +1,14 @@
+#!/usr/bin/perl -w
+
+use strict;
+use File::Spec::Functions qw(updir catdir);
+use FindBin;
+use lib catdir $FindBin::Bin, updir, 'lib';
+use bric_upgrade;
+use Bric::Config qw(MASON_COMP_ROOT);
+
+# Delete legacy non-XHTML desk component.
+my $file = catdir MASON_COMP_ROOT, "widgets", "desk", "desk_item_old.html";
+unlink($file) if -e $file;
+
+__END__
Property changes on: \
bricolage/branches/dev_cssify/inst/upgrade/1.9.0/delete_old_desk_component.pl \
___________________________________________________________________
Name: svn:executable
+ *
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic