[dw-free] proposed new subdirectory: cgi-bin/LJ/Global
[commit: http://hg.dwscoalition.org/dw-free/rev/4a7c38495a66]
http://bugs.dwscoalition.org/show_bug.cgi?id=3974
imageconf.pl / imageconf-local.pl --> LJ/Global/Img.pm; LJ/Local/Img.pm
Patch by
kareila.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=3974
imageconf.pl / imageconf-local.pl --> LJ/Global/Img.pm; LJ/Local/Img.pm
Patch by
![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
Files modified:
- cgi-bin/LJ/Global/Img.pm
- cgi-bin/LJ/Img.pm
- cgi-bin/ljlib.pl
- cgi-bin/weblib.pl
- doc/raw/lj.book/customize/images.xml
-------------------------------------------------------------------------------- diff -r 99fc8a1e82b3 -r 4a7c38495a66 cgi-bin/LJ/Global/Img.pm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cgi-bin/LJ/Global/Img.pm Tue Oct 25 18:40:31 2011 +0800 @@ -0,0 +1,461 @@ +#!/usr/bin/perl +# +# This code was forked from the LiveJournal project owned and operated +# by Live Journal, Inc. The code has been modified and expanded by +# Dreamwidth Studios, LLC. These files were originally licensed under +# the terms of the license supplied by Live Journal, Inc, which can +# currently be found at: +# +# http://code.livejournal.org/trac/livejournal/browser/trunk/LICENSE-LiveJournal.txt +# +# In accordance with the original license, this code and all its +# modifications are provided under the GNU General Public License. +# A copy of that license can be found in the LICENSE file included as +# part of this distribution. + +use strict; +package LJ::Img; +our %img; + +$img{ins_obj} = { + src => '/ins-object.gif', + width => 129, + height => 52, + alt => 'img.ins_obj', +}; + +$img{btn_up} = { + src => '/btn_up.gif', + width => 22, + height => 20, + alt => 'img.btn_up', +}; + +$img{btn_down} = { + src => '/btn_dn.gif', + width => 22, + height => 20, + alt => 'img.btn_down', +}; + +$img{btn_next} = { + src => '/btn_next.gif', + width => 22, + height => 20, + alt => 'img.btn_next', +}; + +$img{btn_prev} = { + src => '/btn_prev.gif', + width => 22, + height => 20, + alt => 'img.btn_prev', +}; + +$img{btn_del} = { + src => '/silk/comments/delete.png', + width => 16, + height => 16, + alt => 'img.btn_del', +}; + +$img{btn_trash} = { + src => '/portal/btn_del.gif', + width => 15, + height => 15, + alt => 'img.btn_del', +}; + +$img{btn_freeze} = { + src => '/silk/comments/freeze.png', + width => 16, + height => 16, + alt => 'img.btn_freeze', +}; + +$img{btn_unfreeze} = { + src => '/silk/comments/unfreeze.png', + width => 16, + height => 16, + alt => 'img.btn_unfreeze', +}; + +$img{btn_scr} = { + src => '/silk/comments/screen.png', + width => 16, + height => 16, + alt => 'img.btn_scr', +}; + +$img{btn_unscr} = { + src => '/silk/comments/unscreen.png', + width => 16, + height => 16, + alt => 'img.btn_unscr', +}; + +$img{prev_entry} = { + src => '/silk/entry/previous.png', + width => 16, + height => 16, + alt => 'img.prev_entry', +}; + +$img{next_entry} = { + src => '/silk/entry/next.png', + width => 16, + height => 16, + alt => 'img.next_entry', +}; + +$img{memadd} = { + src => '/silk/entry/memories_add.png', + width => 16, + height => 16, + alt => 'img.memadd', +}; + +$img{editentry} = { + src => '/silk/entry/edit.png', + width => 16, + height => 16, + alt => 'img.editentry', +}; + +$img{edittags} = { + src => '/silk/entry/tag_edit.png', + width => 16, + height => 16, + alt => 'img.edittags', +}; + +$img{tellfriend} = { + src => '/silk/entry/tellafriend.png', + width => 16, + height => 16, + alt => 'img.tellfriend', +}; + +$img{placeholder} = { + src => '/imageplaceholder2.png', + width => 35, + height => 35, + alt => 'img.placeholder', +}; + +$img{xml} = { + src => '/xml.gif', + width => 36, + height => 14, + alt => 'img.xml', +}; + +$img{track} = { + src => '/silk/entry/track.png', + width => 16, + height => 16, + alt => 'img.track', +}; + +$img{track_active} = { + src => '/silk/entry/untrack.png', + width => 16, + height => 16, + alt => 'img.track_active', +}; + +$img{track_thread_active} = { + src => '/silk/entry/untrack.png', + width => 16, + height => 16, + alt => 'img.track_thread_active', +}; + +$img{untrack} = { + src => '/silk/entry/untrack.png', + width => 16, + height => 16, + alt => 'img.untrack', +}; + +$img{editcomment} = { + src => '/silk/comments/edit.png', + width => 16, + height => 16, + alt => 'img.editcomment', +}; + +$img{foaf} = { + src => '/data_foaf.gif', + width => 32, + height => 15, + alt => 'img.foaf', +}; + +$img{atom} = { + src => '/data_atom.gif', + width => 32, + height => 15, + alt => 'img.atom', +}; + +$img{rss} = { + src => '/data_rss.gif', + width => 32, + height => 15, + alt => 'img.rss', +}; + +$img{key} = { + src => '/key.gif', + width => 16, + height => 16, + alt => 'img.key', +}; + +$img{help} = { + src => '/silk/site/help.png', + width => 14, + height => 14, + alt => 'img.help', +}; + +$img{hourglass} = { + src => '/hourglass.gif', + width => 17, + height => 17, + alt => 'img.hourglass', +}; + +$img{searchdots} = { + src => '/searchingdots.gif', + width => 18, + height => 12, + alt => 'img.searchdots', +}; + +$img{nouserpic} = { + src => '/nouserpic.png', + width => 100, + height => 100, + alt => 'img.nouserpic', +}; + +$img{nouserpic_sitescheme} = { + src => '/nouserpic.png', + width => 80, + height => 80, + alt => 'sitescheme.accountlinks.userpic.alt', +}; + +$img{circle_yes} = { + src => '/silk/site/tick.png', + width => 16, + height => 16, + alt => 'img.circle_yes', +}; + +$img{circle_no} = { + src => '/silk/site/cross.png', + width => 16, + height => 16, + alt => 'img.circle_no', +}; + +$img{create_check} = { + src => '/create/check.png', + width => 12, + height => 12, + alt => 'widget.createaccount.field.username.available', +}; + +$img{check} = { + src => '/check.gif', + width => 15, + height => 15, + alt => '', +}; + +$img{flag} = { + src => '/flag_on.gif', + width => 12, + height => 14, + alt => '', +}; + +$img{bookmark_on} = { + src => '/flag_on.gif', + width => 16, + height => 18, + alt => 'widget.inbox.notification.rem_bookmark', +}; + +$img{bookmark_off} = { + src => '/flag_off.gif', + width => 16, + height => 18, + alt => 'widget.inbox.notification.add_bookmark', +}; + +$img{inbox_expand} = { + src => '/expand.gif', + width => 11, + height => 11, + alt => 'widget.inbox.notification.expanded', +}; + +$img{inbox_collapse} = { + src => '/collapse.gif', + width => 11, + height => 11, + alt => 'widget.inbox.notification.collapsed', +}; + +$img{ssl_locked} = { + src => '/padlocked.gif', + width => 20, + height => 16, + alt => 'img.ssl', +}; + +$img{ssl_unlocked} = { + src => '/unpadlocked.gif', + width => 20, + height => 16, + alt => 'img.ssl', +}; + +$img{'arrow-down'} = { + src => '/profile_icons/arrow-down.gif', + width => 12, + height => 12, + alt => 'img.arrow-down', +}; + +$img{'arrow-right'} = { + src => '/profile_icons/arrow-right.gif', + width => 12, + height => 12, + alt => 'img.arrow-right', +}; + +$img{'security-protected'} = { + src => '/silk/entry/locked.png', + width => 16, + height => 16, + alt => '', # S2::PROPS +}; + +$img{'security-private'} = { + src => '/silk/entry/private.png', + width => 16, + height => 16, + alt => '', # S2::PROPS +}; + +$img{'security-groups'} = { + src => '/silk/entry/filtered.png', + width => 21, + height => 13, + alt => '', # S2::PROPS +}; + +$img{'adult-nsfw'} = { + src => '/icon_nsfw.png', + width => 16, + height => 16, + alt => 'talk.agerestriction.nsfw', # overridden by S2::PROPS +}; + +$img{'adult-18'} = { + src => '/icon_18.png', + width => 16, + height => 16, + alt => 'talk.agerestriction.18plus', # overridden by S2::PROPS +}; + +$img{'sticky-entry'} = { + src => '/silk/entry/sticky_entry.png', + width => 16, + height => 16, + alt => '', # S2::PROPS +}; + +$img{'id_anonymous'} = { + src => '/silk/identity/anonymous.png', + width => 16, + height => 16, + alt => 'img.id_anonymous', +}; + +$img{'id_openid'} = { + src => '/silk/identity/openid.png', + width => 16, + height => 16, + alt => 'img.id_openid', +}; + +$img{'id_user'} = { + src => '/silk/identity/user.png', + width => 16, + height => 16, + alt => 'img.id_user', +}; + +$img{'id_community-24'} = { + src => '/silk/24x24/community.png', + width => 24, + height => 24, + alt => 'img.id_community', +}; + +$img{'id_feed-24'} = { + src => '/silk/24x24/feed.png', + width => 24, + height => 24, + alt => 'img.id_feed', +}; + +$img{'id_openid-24'} = { + src => '/silk/24x24/openid.png', + width => 24, + height => 24, + alt => 'img.id_openid', +}; + +$img{'id_user-24'} = { + src => '/silk/24x24/user.png', + width => 24, + height => 24, + alt => 'img.id_user', +}; + +$img{'poll_left'} = { + src => '/poll/leftbar.gif', + width => 7, + height => 14, + alt => '', +}; + +$img{'poll_right'} = { + src => '/poll/rightbar.gif', + width => 7, + height => 14, + alt => '', +}; + +$img{post} = { + src => '/silk/profile/post.png', + width => 20, + height => 18, + alt => '', +}; + +# load the site-local version, if it's around. +eval "use LJ::Local::Img;"; + +# if the old local filename is in use, log an error. +warn "NOTE: Found imageconf-local.pl, please rename to cgi-bin/LJ/Local/Img.pm" + if -e "$LJ::HOME/cgi-bin/imageconf-local.pl"; + +1; diff -r 99fc8a1e82b3 -r 4a7c38495a66 cgi-bin/LJ/Img.pm --- a/cgi-bin/LJ/Img.pm Tue Oct 25 17:18:35 2011 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,461 +0,0 @@ -#!/usr/bin/perl -# -# This code was forked from the LiveJournal project owned and operated -# by Live Journal, Inc. The code has been modified and expanded by -# Dreamwidth Studios, LLC. These files were originally licensed under -# the terms of the license supplied by Live Journal, Inc, which can -# currently be found at: -# -# http://code.livejournal.org/trac/livejournal/browser/trunk/LICENSE-LiveJournal.txt -# -# In accordance with the original license, this code and all its -# modifications are provided under the GNU General Public License. -# A copy of that license can be found in the LICENSE file included as -# part of this distribution. - -use strict; -package LJ::Img; -our %img; - -$img{ins_obj} = { - src => '/ins-object.gif', - width => 129, - height => 52, - alt => 'img.ins_obj', -}; - -$img{btn_up} = { - src => '/btn_up.gif', - width => 22, - height => 20, - alt => 'img.btn_up', -}; - -$img{btn_down} = { - src => '/btn_dn.gif', - width => 22, - height => 20, - alt => 'img.btn_down', -}; - -$img{btn_next} = { - src => '/btn_next.gif', - width => 22, - height => 20, - alt => 'img.btn_next', -}; - -$img{btn_prev} = { - src => '/btn_prev.gif', - width => 22, - height => 20, - alt => 'img.btn_prev', -}; - -$img{btn_del} = { - src => '/silk/comments/delete.png', - width => 16, - height => 16, - alt => 'img.btn_del', -}; - -$img{btn_trash} = { - src => '/portal/btn_del.gif', - width => 15, - height => 15, - alt => 'img.btn_del', -}; - -$img{btn_freeze} = { - src => '/silk/comments/freeze.png', - width => 16, - height => 16, - alt => 'img.btn_freeze', -}; - -$img{btn_unfreeze} = { - src => '/silk/comments/unfreeze.png', - width => 16, - height => 16, - alt => 'img.btn_unfreeze', -}; - -$img{btn_scr} = { - src => '/silk/comments/screen.png', - width => 16, - height => 16, - alt => 'img.btn_scr', -}; - -$img{btn_unscr} = { - src => '/silk/comments/unscreen.png', - width => 16, - height => 16, - alt => 'img.btn_unscr', -}; - -$img{prev_entry} = { - src => '/silk/entry/previous.png', - width => 16, - height => 16, - alt => 'img.prev_entry', -}; - -$img{next_entry} = { - src => '/silk/entry/next.png', - width => 16, - height => 16, - alt => 'img.next_entry', -}; - -$img{memadd} = { - src => '/silk/entry/memories_add.png', - width => 16, - height => 16, - alt => 'img.memadd', -}; - -$img{editentry} = { - src => '/silk/entry/edit.png', - width => 16, - height => 16, - alt => 'img.editentry', -}; - -$img{edittags} = { - src => '/silk/entry/tag_edit.png', - width => 16, - height => 16, - alt => 'img.edittags', -}; - -$img{tellfriend} = { - src => '/silk/entry/tellafriend.png', - width => 16, - height => 16, - alt => 'img.tellfriend', -}; - -$img{placeholder} = { - src => '/imageplaceholder2.png', - width => 35, - height => 35, - alt => 'img.placeholder', -}; - -$img{xml} = { - src => '/xml.gif', - width => 36, - height => 14, - alt => 'img.xml', -}; - -$img{track} = { - src => '/silk/entry/track.png', - width => 16, - height => 16, - alt => 'img.track', -}; - -$img{track_active} = { - src => '/silk/entry/untrack.png', - width => 16, - height => 16, - alt => 'img.track_active', -}; - -$img{track_thread_active} = { - src => '/silk/entry/untrack.png', - width => 16, - height => 16, - alt => 'img.track_thread_active', -}; - -$img{untrack} = { - src => '/silk/entry/untrack.png', - width => 16, - height => 16, - alt => 'img.untrack', -}; - -$img{editcomment} = { - src => '/silk/comments/edit.png', - width => 16, - height => 16, - alt => 'img.editcomment', -}; - -$img{foaf} = { - src => '/data_foaf.gif', - width => 32, - height => 15, - alt => 'img.foaf', -}; - -$img{atom} = { - src => '/data_atom.gif', - width => 32, - height => 15, - alt => 'img.atom', -}; - -$img{rss} = { - src => '/data_rss.gif', - width => 32, - height => 15, - alt => 'img.rss', -}; - -$img{key} = { - src => '/key.gif', - width => 16, - height => 16, - alt => 'img.key', -}; - -$img{help} = { - src => '/silk/site/help.png', - width => 14, - height => 14, - alt => 'img.help', -}; - -$img{hourglass} = { - src => '/hourglass.gif', - width => 17, - height => 17, - alt => 'img.hourglass', -}; - -$img{searchdots} = { - src => '/searchingdots.gif', - width => 18, - height => 12, - alt => 'img.searchdots', -}; - -$img{nouserpic} = { - src => '/nouserpic.png', - width => 100, - height => 100, - alt => 'img.nouserpic', -}; - -$img{nouserpic_sitescheme} = { - src => '/nouserpic.png', - width => 80, - height => 80, - alt => 'sitescheme.accountlinks.userpic.alt', -}; - -$img{circle_yes} = { - src => '/silk/site/tick.png', - width => 16, - height => 16, - alt => 'img.circle_yes', -}; - -$img{circle_no} = { - src => '/silk/site/cross.png', - width => 16, - height => 16, - alt => 'img.circle_no', -}; - -$img{create_check} = { - src => '/create/check.png', - width => 12, - height => 12, - alt => 'widget.createaccount.field.username.available', -}; - -$img{check} = { - src => '/check.gif', - width => 15, - height => 15, - alt => '', -}; - -$img{flag} = { - src => '/flag_on.gif', - width => 12, - height => 14, - alt => '', -}; - -$img{bookmark_on} = { - src => '/flag_on.gif', - width => 16, - height => 18, - alt => 'widget.inbox.notification.rem_bookmark', -}; - -$img{bookmark_off} = { - src => '/flag_off.gif', - width => 16, - height => 18, - alt => 'widget.inbox.notification.add_bookmark', -}; - -$img{inbox_expand} = { - src => '/expand.gif', - width => 11, - height => 11, - alt => 'widget.inbox.notification.expanded', -}; - -$img{inbox_collapse} = { - src => '/collapse.gif', - width => 11, - height => 11, - alt => 'widget.inbox.notification.collapsed', -}; - -$img{ssl_locked} = { - src => '/padlocked.gif', - width => 20, - height => 16, - alt => 'img.ssl', -}; - -$img{ssl_unlocked} = { - src => '/unpadlocked.gif', - width => 20, - height => 16, - alt => 'img.ssl', -}; - -$img{'arrow-down'} = { - src => '/profile_icons/arrow-down.gif', - width => 12, - height => 12, - alt => 'img.arrow-down', -}; - -$img{'arrow-right'} = { - src => '/profile_icons/arrow-right.gif', - width => 12, - height => 12, - alt => 'img.arrow-right', -}; - -$img{'security-protected'} = { - src => '/silk/entry/locked.png', - width => 16, - height => 16, - alt => '', # S2::PROPS -}; - -$img{'security-private'} = { - src => '/silk/entry/private.png', - width => 16, - height => 16, - alt => '', # S2::PROPS -}; - -$img{'security-groups'} = { - src => '/silk/entry/filtered.png', - width => 21, - height => 13, - alt => '', # S2::PROPS -}; - -$img{'adult-nsfw'} = { - src => '/icon_nsfw.png', - width => 16, - height => 16, - alt => 'talk.agerestriction.nsfw', # overridden by S2::PROPS -}; - -$img{'adult-18'} = { - src => '/icon_18.png', - width => 16, - height => 16, - alt => 'talk.agerestriction.18plus', # overridden by S2::PROPS -}; - -$img{'sticky-entry'} = { - src => '/silk/entry/sticky_entry.png', - width => 16, - height => 16, - alt => '', # S2::PROPS -}; - -$img{'id_anonymous'} = { - src => '/silk/identity/anonymous.png', - width => 16, - height => 16, - alt => 'img.id_anonymous', -}; - -$img{'id_openid'} = { - src => '/silk/identity/openid.png', - width => 16, - height => 16, - alt => 'img.id_openid', -}; - -$img{'id_user'} = { - src => '/silk/identity/user.png', - width => 16, - height => 16, - alt => 'img.id_user', -}; - -$img{'id_community-24'} = { - src => '/silk/24x24/community.png', - width => 24, - height => 24, - alt => 'img.id_community', -}; - -$img{'id_feed-24'} = { - src => '/silk/24x24/feed.png', - width => 24, - height => 24, - alt => 'img.id_feed', -}; - -$img{'id_openid-24'} = { - src => '/silk/24x24/openid.png', - width => 24, - height => 24, - alt => 'img.id_openid', -}; - -$img{'id_user-24'} = { - src => '/silk/24x24/user.png', - width => 24, - height => 24, - alt => 'img.id_user', -}; - -$img{'poll_left'} = { - src => '/poll/leftbar.gif', - width => 7, - height => 14, - alt => '', -}; - -$img{'poll_right'} = { - src => '/poll/rightbar.gif', - width => 7, - height => 14, - alt => '', -}; - -$img{post} = { - src => '/silk/profile/post.png', - width => 20, - height => 18, - alt => '', -}; - -# load the site-local version, if it's around. -eval "use LJ::ImgLocal;"; - -# if the old local filename is in use, log an error. -warn "NOTE: Found imageconf-local.pl, please rename to cgi-bin/LJ/ImgLocal.pm" - if -e "$LJ::HOME/cgi-bin/imageconf-local.pl"; - -1; diff -r 99fc8a1e82b3 -r 4a7c38495a66 cgi-bin/ljlib.pl --- a/cgi-bin/ljlib.pl Tue Oct 25 17:18:35 2011 +0800 +++ b/cgi-bin/ljlib.pl Tue Oct 25 18:40:31 2011 +0800 @@ -107,7 +107,7 @@ use LJ::Capabilities; use DW::Mood; require "ljrelation.pl"; -use LJ::Img; +use LJ::Global::Img; # defines LJ::Img require "$LJ::HOME/cgi-bin/ljlib-local.pl" if -e "$LJ::HOME/cgi-bin/ljlib-local.pl"; diff -r 99fc8a1e82b3 -r 4a7c38495a66 cgi-bin/weblib.pl --- a/cgi-bin/weblib.pl Tue Oct 25 17:18:35 2011 +0800 +++ b/cgi-bin/weblib.pl Tue Oct 25 18:40:31 2011 +0800 @@ -37,8 +37,8 @@ # code, which each site may define with a different image file with # its own dimensions. This prevents hard-coding filenames & sizes # into the source. The real image data is stored in LJ::Img, which -# has default values provided in cgi-bin/LJ/Img.pm but can be -# overridden in etc/config.pl. +# has default values provided in cgi-bin/LJ/Global/Img.pm but can be +# overridden in cgi-bin/LJ/Local/Img.pm or etc/config.pl. # args: imagecode, type?, attrs? # des-imagecode: The unique string key to reference the image. Not a filename, # but the purpose or location of the image. diff -r 99fc8a1e82b3 -r 4a7c38495a66 doc/raw/lj.book/customize/images.xml --- a/doc/raw/lj.book/customize/images.xml Tue Oct 25 17:18:35 2011 +0800 +++ b/doc/raw/lj.book/customize/images.xml Tue Oct 25 18:40:31 2011 +0800 @@ -1,19 +1,19 @@ <chapter id="lj.customize.images"> <title>Using your own images and icons</title> <section id="lj.customize.images.imageconf"> - <title>Using <filename>LJ/Img.pm</filename></title> + <title>Using <filename>LJ/Global/Img.pm</filename></title> <para> &lj; uses a standard set of icons for specific pages that are distributed through the <filename role="directory">htdocs/img</filename> directory. - The <filename>cgi-bin/LJ/Img.pm</filename> file handles the configuration for these images. + The <filename>cgi-bin/LJ/Global/Img.pm</filename> file handles the configuration for these images. Each image is configured as an associative array in perl, setup with attributes for each file. Text for <sgmltag class="attribute">alt</sgmltag> attributes can be English-stripped, so the text is pulled from the language file. </para> <para> - <filename>cgi-bin/LJ/Img.pm</filename> is provided. Don't + <filename>cgi-bin/LJ/Global/Img.pm</filename> is provided. Don't change that. But go ahead and add a new file, - <filename>cgi-bin/LJ/ImgLocal.pm</filename> beside it in the same - format, which <filename>LJ/Img.pm</filename> will find and use. + <filename>cgi-bin/LJ/Local/Img.pm</filename> beside it in the same + format, which <filename>LJ/Global/Img.pm</filename> will find and use. </para> </section> </chapter> --------------------------------------------------------------------------------