From 32b1bb381acd14ec6a0d98afc5c39247b1d5a027 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 3 Feb 2009 21:46:09 +0000 Subject: [PATCH 1/5] Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html() --- actions/newnotice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/newnotice.php b/actions/newnotice.php index 5142cb5ff2..e3974cd07d 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -195,7 +195,7 @@ class NewnoticeAction extends Action function ajaxErrorMsg($msg) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Ajax Error')); $this->elementEnd('head'); From bcc8348615e0dbc4c82089b69f7d92f070d6ec6e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 3 Feb 2009 22:09:25 +0000 Subject: [PATCH 2/5] Removed deprecated files from the default theme. --- theme/default/bg-body.gif | Bin 154 -> 0 bytes theme/default/bg-header.gif | Bin 2463 -> 0 bytes theme/default/display.css | 1107 ------------------------------- theme/default/icon_feed.jpg | Bin 521 -> 0 bytes theme/default/icon_foaf.gif | Bin 1144 -> 0 bytes theme/default/icon_heart-01.gif | Bin 67 -> 0 bytes theme/default/icon_heart-02.gif | Bin 74 -> 0 bytes theme/default/icon_tag-01.gif | Bin 586 -> 0 bytes theme/default/ie6.css | 73 -- theme/default/ie7.css | 39 -- theme/default/login-bg.gif | Bin 328 -> 0 bytes 11 files changed, 1219 deletions(-) delete mode 100644 theme/default/bg-body.gif delete mode 100644 theme/default/bg-header.gif delete mode 100644 theme/default/display.css delete mode 100644 theme/default/icon_feed.jpg delete mode 100644 theme/default/icon_foaf.gif delete mode 100644 theme/default/icon_heart-01.gif delete mode 100644 theme/default/icon_heart-02.gif delete mode 100644 theme/default/icon_tag-01.gif delete mode 100644 theme/default/ie6.css delete mode 100644 theme/default/ie7.css delete mode 100644 theme/default/login-bg.gif diff --git a/theme/default/bg-body.gif b/theme/default/bg-body.gif deleted file mode 100644 index 5e1afa048fc1bd0c203e6be880cbf09550f03688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmZ?wbhEHbJiyGzu$h73&;PGC9$o+c|Nr%e*Dl??eDw0ktM{*7e{_A{*&_$eA3cBT z!l`R#7?6PCPZlsw2SkF*U|?}KIN`Z^uf=QMqCl1XYAR`V~cDDhewwf@E$v56WwA}r162Q+7&f5E|E4FIzEM_2#= diff --git a/theme/default/bg-header.gif b/theme/default/bg-header.gif deleted file mode 100644 index a34b9b34fa0198fc090f1b9c664f9fbafcf686a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2463 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 diff --git a/theme/default/display.css b/theme/default/display.css deleted file mode 100644 index f22f9aa69b..0000000000 --- a/theme/default/display.css +++ /dev/null @@ -1,1107 +0,0 @@ -/* CSS Document */ -/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ - -html { - background-color: #f6e5b0; - } -body { - position: absolute; - width: 100%; - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 12px; - min-height: 100%; - height: 100%; - color: #701238; - } -a { - color: #d1451a; - text-decoration: none; - } -a:hover { - text-decoration: underline; - } -img, img a { - border: 0; - } -h1 { - font-size: 14px; - } - -#wrap { - margin: 0 auto; - padding: 0 20px; - width: 760px; - background: url(bg-header.gif) repeat-x #fbf2d7; - } -#header { - position: relative; - margin: 0 auto; - width: 600px; - height: 216px; - } -#logo { - margin-top: 9px; - } -p#branding { - margin: 0; - padding: 6px 0 3px 0; - color: #fbf2d7; - font-size: 21px; - font-weight: bold; - line-height: 27px; - } -p#branding a { - color: #dab134; - } - -#header h1.pagetitle { - margin: 0; - padding: 0; - font-size: 15px; - line-height: 24px; - color: #fff6d5; -} - -#header h2.sitename { - display: none; - margin: 0; - padding: 0; - color: #fff6d5; -} - -abbr.published { border-bottom:0; } - -/* ===== Begin Navigation Styling ===== */ - -/* ----- Navigation ------ */ -#nav { - float: right; - margin: 0; - padding: 0; - list-style-type: none; - font-size: 12px; - } -#nav li { - display: block; - float: left; - } -#nav li a { - display: block; - padding: 9px 9px 12px 9px; - color: #F60; - } -#nav li a:hover { - text-decoration: underline; - } - -/* ----- Tabs ----- */ -#nav_views { - margin: 0 auto; - padding: 0; - position: absolute; - bottom: 0; - list-style-type: none; - font-size: 14px; - font-weight: bold; - width: 600px; - /*height: 30px;*/ - } -#nav_views li { - display: block; - float: left; - line-height: 21px; - } -#nav_views li a { - display: block; - margin: 0; - padding: 4px 12px 3px 12px; - color: #fff6d5; - background-color: #d1451a; - border-right: 1px solid #dcaa3f; - } -#nav_views li a:hover { - text-decoration: none; - } -#nav_views li.current a, #nav_views li.current a:hover { - color: #701238; - background-color: #fff6d5; - border-right: 1px solid #dcaa3f; - } -#nav_views li.current a:hover { - color: #d1451a; - } -#nav_views li a:hover { - color: #fff6d5; - background-color: #701238; - border-right: 1px solid #dcaa3f; - } - -.feeds { -clear:both; -float:right; -margin-top:1.25em; -position:absolute; -right:0; -bottom:-30px; -} -.feeds * { -line-height:1.4; -padding:0; -margin:0; -font-size:12px; -} - -.feeds p { -font-weight:bold; -display:inline; -display:none; -} -.feeds ul { -display:inline; -} -.feeds li { -list-style-type:none; -display:inline; -margin-left:0.5em; -} -.feeds li a.rss, -.feeds li a.atom { -background:url(icon_feed.jpg) no-repeat; -padding-top:2px; -padding-left:20px; -} -.feeds li a.foaf { -background:url(icon_foaf.gif) no-repeat; -padding-top:2px; -padding-left:30px; -} - -form#disfavor, form.disfavor, -form#favor, form.favor { - float: right; -} - -/*favorites*/ -input#favor, input.favor, -input#disfavor, input.disfavor { - background-color:#fcfff5; - background-color:transparent; - background-image:url(icon_heart-02.gif); - background-repeat:no-repeat; - cursor: pointer; - border: 0; - width: 16px; - height:16px; - text-indent:-9999px; -} - -input#disfavor, input.disfavor { - background-image:url(icon_heart-01.gif); -} - -.notice_single:hover input.favor, -.notice_single:hover input.disfavor { - background-color:#f3f8ea; -} - -/*profile_actions*/ -#profile_actions { -padding-left:0; -list-style-type:none; -margin:0; -} -#profile_actions li { -margin-bottom:0.5em; -clear:both; -} - -#profile_actions #profile_nudge input.submit, -#profile_actions #profile_block input.submit, -.profile_single form.block input.submit { -margin:0 0 0 -3px; -padding:0; -background-color:transparent; -color:#C15D42; -font-family:Georgia,"Times New Roman",Times,serif; -font-weight:normal; -font-size:14px; -text-align:left; -float:left; -line-height:18px; -} -#profile_actions #profile_nudge input.submit:hover, -#profile_actions #profile_block input.submit:hover { -background-color:transparent; -color:#C15D42; -} - -#wrap p#nudge_response { -background-color:transparent; -line-height:18px; -font-size:14px; -} -#wrap #profile_nudge input.disabled { -color:#999; -cursor:default; -} - - -#wrap form input.disabled, -#wrap form input.disabled:hover { -background-color:#999; -cursor:default; -} - -/* ----- Nav Footer ----- */ -#nav_sub { - clear: both; - margin: 18px auto 0 auto; - padding: 0; - list-style-type: none; - font-size: 11px; - font-weight: bold; - line-height: 21px; - border-top: 1px solid #dec5b5; - width: 600px; - } -#nav_sub li { - display: block; - float: left; - } -#nav_sub li a { - padding: 6px 24px 6px 0; - } -#nav_sub li a:hover { - text-decoration: underline; - } -/* ===== End Navigation Styling ===== */ - -#content { - clear: left; - margin: 40px 0 45px 0; - padding: 0 80px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 14px; - line-height: 18px; - } -#content h2 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 15px; - } -#content label { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - } -.instructions p, .success, .error { - font-weight: normal; - margin: 36px 0 0 0; - padding: 10px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 15px; - border: 1px solid #dec5b5; - color: #fff6d5; - } -.instructions a, .success a, .error a { - color: #d8e2d7; - text-decoration: underline; - } -.instructions a:hover, .success a:hover, .error a:hover { - color: #fff6d5; - } -.success { - background-color: #48705b; - } -.error { - background-color: #ce3728; - } - -/* ----- Stream -----*/ - -#notices { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - width: 600px; - border-top: 1px solid #dec5b5; - } -#notices a:hover { - text-decoration: underline; - } -.notice_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #dec5b5; - background-color:#FCFFF5; - opacity:1; - } -.notice_single:hover { - background-color: #f7ebcc; - } -.notice_single p { - display: inline; - margin: 0; - padding: 0; - } -#notice_delete_form #confirmation_text { - display: block; - font-size: 14px; - font-weight: bold; - } - -input#submit_yes, input#submit_no { - margin: 18px 10px 0px 0px; - padding: 4px; - font-weight: bold; - color: #fff6d5; - background-color: #F60; - cursor: pointer; - border: 0; - width: 40px; - } -input#submit_yes:hover, input#submit_no:hover { - background-color: #701238; - } -.avatar.stream { - float: left; - margin: 0 10px 0.5em 0; - } -p.time { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 15px; - } -p.time a { - color: #dab134; - } - -/* ----- Profile -----*/ -#profile { - clear: left; - margin: 0 -80px; - padding: 10px 0 0 0; - min-height: 170px; - border-top: 1px solid #dec5b5; - font-family: Georgia, "Times New Roman", Times, serif; - margin-bottom:1em; - float:left; - width:750px; - } -#profile h1 { - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 14px; - } -#profile h2 { - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - text-transform: uppercase; - color: #dab134; - } -#profile p { - margin: 0 10px 0 0; - font-size: 12px; - line-height: 14px; - } -#profile p.location { - margin: 0 10px 12px 0; - font-style: italic; - } -#profile p.notice_current { - font-size: 18px; - line-height: 21px; - } -#profile_avatar { - float: left; - margin-right: 4px; - } -#profile_avatar img { - margin-bottom: 5px; - } -.avatar.profile { - clear: left; - margin: 0 10px 5px 0; - } -.avatar.original { - float: left; - margin: 0 10px 18px 0; - } - -#profilesettings { - margin-bottom:2em; -} - - -.avatar_view { - float:left; - margin-bottom:1em; - margin-right:1em; -} - -#avatar_preview_view { - overflow:hidden; - width:96px; - height:96px; -} -#avatar_crop { - margin-bottom:2em; -} - -#avatar_crop, -#avatarfile { - clear:both; -} - -a.nickname { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 12px; - padding-right: 3px; - } -.hentry a.nickname { - font-weight:normal; -} -#profile_information { - float: left; - position: relative; - width: 270px; - } -.statistics { - margin-top: 18px; - } -.statistics h2 { - margin: 12px 0 3px 0; - } -dl.statistics { - margin: 0; - font-size: 12px; - line-height: 14px; - } -.statistics dt { - float: left; - width: 96px; -} -.statistics dd { - margin-left: 100px; -} -.statistics dt:after { - content: ":"; - } -#subscriptions { - float: left; - margin: 18px 0 30px 0; - } -#subscriptions_avatars { - float: left; - margin: 6px 0 0 0; - padding: 0; - list-style-type: none; - width: 270px; - } -#subscriptions_avatars li .avatar.mini { - float: left; - margin: 0 3px 3px 0; - padding: 0; - line-height: 0; - /* border: 1px solid #f00; */ - } -#subscriptions_viewall { - clear: left; - } -/* ----- End Profile -----*/ - -/* ----- Begin Subscriptions & Subscribers -----*/ - -ul.subscriptions, ul.subscribers { - float: none; - margin: 0; - padding: 0; - list-style-type: none; - overflow: auto; - clear:both; - } -ul.subscriptions li, ul.subscribers li { - display: block; - float: left; - padding: 0; - } -/* ----- End Subscriptions & Subscribers -----*/ - -#pagination { - margin: 18px auto; - width: 600px; - } -#nav_pagination { - margin: 0 0 36px 0; - padding: 0; - float: right; - list-style-type: none; - font-size: 12px; - font-weight: bold; - } -#nav_pagination li { - display: block; - float: left; - background-color: #701238; - } -#nav_pagination li.before { - margin-right: 1px; - } -#nav_pagination li a { - padding: 6px 15px; - line-height: 21px; - background-color: #701238; - color: #fff6d5; - } -#nav_pagination li a:hover { - background-color: #3F606F; - color: #fff6d5; - text-decoration: none; - } - -#footer { - clear: both; - margin: 0 auto; - padding: 0 0 36px 0; - width: 600px; - border-top: 1px solid #dec5b5; - } -#footer p { - margin-top: 9px; - line-height: 12px; - } -#cc { - float: left; - margin: 3px 10px 0 0; - } - -/* ===== Begin Forms Styling ===== */ - -/* ----- Forms General Style ----- */ -form { - margin: 0 auto; - padding: 0; - } -form { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - } -form label { - display: block; - font-size: 12px; - font-weight: bold; - line-height: 18px; - } -form input { - border: 1px solid #dec5b5; - width: 264px; - } -input#submit, input.submit { - display: block; - margin: 18px 0; - padding: 4px; - font-weight: bold; - color: #fff6d5; - background-color: #F60; - cursor: pointer; - border: 0; - width: auto; - } -input#submit:hover, input.submit:hover { - background-color: #701238; - } -input.checkbox { - /*width: 14px; - height: 14px;*/ - width: auto; - border: 0; - } - -label.checkbox_label { - display: inline; - font-weight: normal; -} - -textarea, input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #701238; - padding: 3px; - } -textarea:focus, input:focus { - background-color: #f8ebc0; - } -textarea { - width: 270px; - border: 1px solid #D8E2D7; - } -.input_instructions { - margin-top: 3px; - display: block; - font-size: 11px; - line-height: 15px; - color: #924959; - font-family: Verdana, Arial, Helvetica, sans-serif; - } - -/* ----- Status Form ----- */ -#status_form { - height: 96px; - /*background-color: #F00;*/ - } -#status_form p { - margin: 36px 0 0 0; - padding: 0; - } -#status_label { - display: block; - clear: both; - margin: 0; - padding: 0 0 3px 0; - font-size: 18px; - font-weight: bold; - line-height: 24px; - color: #dab134; - } -#status_textarea { - display: block; - float: left; - width: 463px; - height: 35px; - padding: 5px; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #701238; - border: 0; - } -#status_submit { - display: block; - float: left; - margin: 1px 0 0 4px; - width: 63px; - height: 45px; - background-color: #F60; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 14px; - color: #fff6d5; - cursor: pointer; - border: 0; - } -#status_submit:hover { - background-color: #d1451a; - } -#counter { - position: absolute; - top: 140px; - left: -64px; - width: 50px; - font-weight: bold; - text-align: right; -} -.response_error textarea, -.response_error .on_max { -background-color:#fee; -} - -/* ----- Subscribe Form ----- */ -#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe { - clear: left; - margin: 0; - width: 96px; - height: 27px; - font-family: verdana, arial, helvetica, sans-serif; - font-weight: bold; - font-size: 10px; - text-transform: uppercase; - background-color: #F60; - color: #fff6d5; - border: 0; - } -#remotesubscribe { - width: 96px; - height: 22px; - padding: 5px 0 0 0; - text-align: center; - } -#content .subscribe .button:hover, #content .unsubscribe .button:hover { - background-color: #904632; - cursor: pointer; - } - -a#remotesubscribe { - display: block; -} - -/* ----- Login Form -----*/ -input#license { - width: auto; - border: 0; - } -/* ----- Avatar Form -----*/ -form { - clear: left; -} - -/* ----- OpenID Form -----*/ - -input#openid_url { - background: url(login-bg.gif) no-repeat; - background-color: #fff; - background-position: 4px 50%; - color: #000; - padding-left: 24px; -} - -/* People lists (search results, maybe subscribers) */ - -#profiles { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - width: 600px; - border-top: 1px solid #dec5b5; - /*border: 1px solid #F00;*/ - } -#profiles a:hover { - text-decoration: underline; - } - -.profile_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #dec5b5; - width:100%; - float:left; - } -.profile_single:hover { - background-color: #f7ebcc; - } - -.profile_single form.block, -.profile_single form.subscribe, -.profile_single form.unsubscribe { - float: right; -} - -form.subedit { - margin-left:4.5em; -} -form.subedit p { - display:inline; - -} -form.subedit input.submit { - margin:0 0 0 0.5em; - display:inline; - background-color:transparent; - padding:0; - color:#C15D42; - border:1px solid #C15D42; -} - - - -/* ----- IM Settings Form -----*/ - -#imsettings p { - margin: 0; - padding: 0; - line-height: 15px; -} - -/* ----- direct message ----- */ - -#message_form { - height: 96px; - /*background-color: #F00;*/ - } - -#message_form p { - margin: 21px 0 0 0; - padding: 0; - } -#message_form label { - display: inline; - } - -#message_content { - display: block; - float: left; - width: 463px; - height: 35px; - padding: 5px; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #193441; - border: 0; - } - -#message_send { - display: block; - float: left; - margin: 1px 0 0 4px; - width: 63px; - height: 45px; - background-color: #C15D42; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 14px; - color: #FCFFF5; - cursor: pointer; - border: 0; - } - -#message_send:hover { - background-color: #904632; - } - -/* ===== End Forms Styling ===== */ - -/* ===== Tag Cloud Styling ===== */ - -p.tagcloud { -text-align: center; -} - -p.tagcloud a { -line-height:100%; -vertical-align:middle; -} - -p.tagcloud a.largest { -font-size: 400%; -} -p.tagcloud a.verylarge { -font-size: 300%; -} - -p.tagcloud a.large { -font-size: 200%; -} - -p.tagcloud a.medium { -font-size: 150%; -} - -p.tagcloud a.small { -font-size: 100%; -} - -p.tagcloud a.verysmall { -font-size: 80%; -} - -p.tagcloud a.smallest { -font-size: 60%; -} - -#subscriptions_nav, -#filter_tags { -margin:0 0 2em 0; -} - -#subscriptions_nav { -padding-bottom:0.5em; -/*border-bottom:1px solid #D8E2D7;*/ -float:right; -} -#filter_tags { -float:left; -} - -#subscriptions_nav dt, -#filter_tags dt { -display:none; -} -#subscriptions_nav dd, -#filter_tags dd { -margin-left:0; -} -#subscriptions_nav ul, -#filter_tags ul { -padding-left:0; -list-style-type:none; -margin-left:0; -} -#subscriptions_nav ul li { -display:inline; -padding-left:0.5em; -margin-left:0.5em; -border-left:1px solid #D8E2D7;; -} -#subscriptions_nav ul li.child_1 { -border-left:0; -padding-left:0; -margin-left:0; -} - -#filter_tags ul li { -float:left; -margin-left:0.5em; -padding-left:0.5em; -border-left:1px solid #D8E2D7;; -} -#filter_tags ul li.child_1 { -margin-left:0; -border-left:0; -padding-left:0; -} -#filter_tags ul li li { -margin-left:0; -} -#filter_tags ul li#filter_tags_item { -width:30em; -} -#filter_tags ul li#filter_tags_item form { -clear:none; -} -#filter_tags ul li#filter_tags_item label { -margin-right:0.5em; -font-size:14px; -font-weight:normal; -font-family:Georgia,"Times New Roman",Times,serif; -} -#filter_tags ul li#filter_tags_item label, -#filter_tags ul li#filter_tags_item select { -margin-top:-1px; -margin-bottom:0.5em; -display:inline; -} -#filter_tags ul li#filter_tags_item p { -margin:0 1em 0 0; -padding:0; -float:left; -} -#filter_tags ul li .input_instructions { -display:inline; -display:block; -margin:0; -} -#filter_tags ul li#filter_tags_item .submit { -margin:0; -} - -.tags_self, -.tags_user { -margin-left:4.5em; -} -.tags_self dl, -.tags_user dl { -margin-left:0; -} - -.tags_self dt, -.tags_user dt { -display:inline; -margin-right:0.5em; -} - -.tags_self dd, -.tags_user dd { -margin-left:0; -display:inline; -} - -ul.tags { -padding-left:0; -margin-left:0; -list-style-type:none; -display:inline; -} -ul.tags li { -display:inline; -margin-right:0.75em; -} -ul.tags li a { -padding-left:17px; -background:url(icon_tag-01.gif) no-repeat; -line-height:1.5; -} - -.tags_user { -margin-bottom:0.5em; -} - -form#tag_user { -margin-left:8.75em; -clear:both; -} -form#tag_user p { -margin:0; -} - -form#tag_user label { -display:inline; -margin-right:1em; -} -form#tag_user .submit { -margin-left:4em; -} - -form#tag_user .input_instructions { -margin-left:4.5em; -} - -.profile_list p { -margin:0 0 0.5em 0; -} - -.profile_list .bio { -margin-left:4.5em; -} - -/* ----- Mailbox ----- */ -#messages { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - width: 600px; - border-top: 1px solid #dec5b5; - } - -#messages a:hover { - text-decoration: underline; - } - -.message_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #dec5b5; - } -.message_single:hover { - background-color: #f7ebcc; - } -.message_single p { - display: inline; - margin: 0; - padding: 0; - } diff --git a/theme/default/icon_feed.jpg b/theme/default/icon_feed.jpg deleted file mode 100644 index 53c4d49597aecf93ff3acfee8bdfd7cf0e7a1010..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%2nfSFN{fk}{&S&;Gn5r#|# zMn<3;kpK%jBLg$47&8kSqW}XF6C*PVLWYr6= z?t_KG9of+Kw{o1*N)@^V7i%uLe&=C8;)JB9cQr3Q=l#~cCij$Z-+u=8ZM`gu7)lZ~ za@T%pHQ}{9HKXf&{TA)}7ZPF;_s!bMmmE1?{OaKbnS>Mn8A89T3&i*JrF8R7w1whHElM8C<3ml?j+W9-3dwyO`2L|HqDkn z5%F#4%5=zqhahRU8WmVVw{A%ro6Wr`PE6ceVj2??L*}%}w$5a?_V3v9;raf2cvR|! zleHa30UP`^2O^P(TCHAKSg=~He14Hqsif%uZ8F&hVl+)kq!MMLzPTBX#bWfui_Upx zD&?A({APN6nl_tVpScF^4um#Ch!`OgWH@Z1X>XUc>*oB;p^^I*kHugxqzIz#MkuV+ z27e0fbavY2Z0Yob-EJpWNrkE-kx0z`GV7<3B)Q`M(a*|fwO?ze5|oczl~rJTgzvcP zz!1czQbk)^OUg=ic0LdYc>Kb`Zg=9odT3ob5qn5U- zZT@vXO;3k^3m?hNp^{WgtIf?~Vi*>WTf)DFYicA*OYfDHpIEwZfu=*Xwa2whum5W{ zlO!obgc%u(w8@kv2n>cj-+78r7)Id$weIzL7Z!R>!0^-*v5e!F&8~w3Z(YM%0)Y@I zE{Nm!F$q#$j-}IMH89-M7w}AdKk~&$^8EQ0k%;<%3Q);-{B4CovDekr^qO&h-@R)# zADB!U?U`h6#s5A^?%aeE|u=?euQDt>S{El*K_kZ{mxHA zKZiIhc5pN3^BG3p|I*eU;lW3AS9DcXD27Q~_gwCYuVpe!2=hknj|h-5S$U0@T;=iD z)k0w^HAb$Gi#YE0tpNaNntta0C!(hi1AsYD`8@ym6W|aH&PB`*h_CXP`B1cFukIl$ zs|1(%WPd!$fVg5p|HQsAS^bi1b0#pP6%J=GW{H{G^{kf%TYUG<8ipXeV7Bse-~cv| zbFQln4K0m}iaXIuv5tC2w(J<*7GbcULq^Pkw5D#|;fUDp4ksPTyrZ@I+X3#gFQA-x zk0&Fbfm(V`Kb^8?Lhb_Ijq8^l&o~_g;dlNH1SJ|q-7P$;xu;vu8g;$-KF`Z%EK&)8HeT>g)Y#vUAp}MLgmL1PV~(!a7HD+ zI?Nr*lXC$Eu30nL$d)62zg!{*uVkS>^T@WwmwfEeqXVc$01lsS6Nu{>3~=f{5zlh9 diff --git a/theme/default/icon_heart-01.gif b/theme/default/icon_heart-01.gif deleted file mode 100644 index bdfd7483f08bb995cde9e6f5c1eb196b58c9dd52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67 zcmZ?wbhEHb6krfwXkcVGF2Vl)|9{1wEQ|~cj0`#qKmd|qV3O+TUwQg1zbHfcrcA@B UQTO-NN|?AMwk&%U%)np`099@irT_o{ diff --git a/theme/default/icon_heart-02.gif b/theme/default/icon_heart-02.gif deleted file mode 100644 index cbb35e0dc2f436b6411538f011b96ba55242f3a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmZ?wbhEHb6krfwn8?I%T!Q^S7%(s}DE?$&WME)o&;hc6vI0Q1^pyUUr{D66Go+ab Y96A&7Y<+BkdfNoirLRueu`*Z#05=sEc>n+a diff --git a/theme/default/icon_tag-01.gif b/theme/default/icon_tag-01.gif deleted file mode 100644 index 92e5742ceebfbc8bd4f1e0b3a9dabfc583dd1a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmZ?wbhEHb6krfwc;?P<_UzeTzkYrB^5y2uo5ek|j6%|lL(;cz-+u1gxd#s(JbLtK z+qP{#fBsBwpZ)gj+jsBYnS`c4dGf>{IQ{F_ufKo){`Be7>C>mbfB$~v%9RTjE?l~F z>A-;l=^e9o@7}$4@7@&A^6C$Ha6YoC4i@Zo*?_DPyJ{{8#+|Ns9CLj)-P zWMO1raA(i~xfc{C4D8Dr>?EX&BsmyF+`GEF^xgXV1sNE7x~1H>I5_*c#HLJ@bYpOr zFc5L$w4UG1u|kYP+)>6&+j+G+L%)rMHm7#XYqAFbX^ diff --git a/theme/default/ie6.css b/theme/default/ie6.css deleted file mode 100644 index f9fc8150e7..0000000000 --- a/theme/default/ie6.css +++ /dev/null @@ -1,73 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ -body { - text-align: center; -} -input { - height: 24px; -} -#wrap { - margin: 0 auto; - padding: 0 20px; - width: 800px; - text-align: left; - background: url(bg-header.gif) repeat-x #fbf2d7; - } -#header { - position: relative; - margin-left: 108px; - } -#nav_views { - margin: 0; - } -#nav_views li { - line-height: 19px; - } -.statistics dd { - margin-top: -15px; - clear: both; - } -#notices { - margin: 0; - } -.notice_single { - height: 48px; - } -#profile { - margin-left:0px; -} -#profile p.notice_current { - height: 96px; - } -#filter_tags { - margin-left:20px; -} -#content .subscriptions { - margin-left:30px; - width:100%; -} - -#subscriptions_avatars li { - float: left; - margin: 0; - padding: 0; - } -img.avatar.original, img.avatar.profile { - clear: none; - float: left; -} -#status_textarea { - height: 46px; - } - -#nav_pagination li a { - padding: 6px 15px; - line-height: 27px; - } -#nav_sub { - position: relative; - margin-left: 108px; - } -#footer { - margin-left: 108px; -} diff --git a/theme/default/ie7.css b/theme/default/ie7.css deleted file mode 100644 index 23a3241b76..0000000000 --- a/theme/default/ie7.css +++ /dev/null @@ -1,39 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ -input.disfavor, -input.favor { - text-indent:0; - text-align:right; - padding-left:25px; -} - -#profile_actions li { -float:left; -clear:both; -} -#profile_actions #profile_nudge input.submit { -margin-left:0; -width:100px; -} - -#statistics dd { - clear: both; - } - -#subscriptions_avatars li { - float: left; - } -img.avatar.original, img.avatar.profile { - clear: none; - float: left; -} - -#nav_pagination li a { - padding: 6px 15px; - line-height: 27px; - } - -#filter_tags ul li#filter_tags_item label { -position:relative; -top:-8px; -} \ No newline at end of file diff --git a/theme/default/login-bg.gif b/theme/default/login-bg.gif deleted file mode 100644 index e2d8377db023a3915cc9e8c2f1f5c7462622f0a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmZ?wbhEHb6krfwxXQrr>({UQ_wR4qxN*;(J#*&FS-N!TvSrKGuV4S?%F;i7{_Nbj z^V6qK`}XadJ9qBs)2Dx~3p;V*#MZ4_j~qF&aN)v#|Nb2~aNyvg9 ztXT2$=g%EGcI@80`{m1*Z{NOs{rdIFl`EeF4W-ruOthu2f ztl_Mdp@*QzZPDcui{^-N`o3xq@(UMrZh5FF-w`Y#$*8QNq^Zf+5a!Y$(d{Fk$;RMZ d?jf!z+?DC8mZr!$-G@O{mX$wbm9ry*H2@d`j5z=R From 05e11ea0210fbad502d5fcd5c75ff379fd7824a4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 3 Feb 2009 22:12:04 +0000 Subject: [PATCH 3/5] Removed deprecated files from the identica theme. --- theme/identica/bg-body.gif | Bin 136 -> 0 bytes theme/identica/bg-header.gif | Bin 2469 -> 0 bytes theme/identica/display.css | 187 ----------------------------------- theme/identica/ie6.css | 14 --- theme/identica/ie7.css | 3 - theme/identica/login-bg.gif | Bin 328 -> 0 bytes 6 files changed, 204 deletions(-) delete mode 100644 theme/identica/bg-body.gif delete mode 100644 theme/identica/bg-header.gif delete mode 100644 theme/identica/display.css delete mode 100644 theme/identica/ie6.css delete mode 100644 theme/identica/ie7.css delete mode 100644 theme/identica/login-bg.gif diff --git a/theme/identica/bg-body.gif b/theme/identica/bg-body.gif deleted file mode 100644 index d87e2e8d76f7ff81d3ab327b7e3a06c8a8d6bb1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmZ?wbhEHbJiyGzu$h73&;PGC9$o+c|Nr%e*Dl??eDw0ktM{*7e{_A{*&_$eA3cBT z!l`R#7?6Mthz-)qz+!7~!gKXri`Tx#CD|70xHd6ltXh}zdS8Lg`I6lG73<#Dy#Ie- hL4k*kRR4)3MJID!33MKEax|!5o3p0ubT0#gH2{s0LAn3{ diff --git a/theme/identica/bg-header.gif b/theme/identica/bg-header.gif deleted file mode 100644 index 5154b2e5e9fec15cf8b1e8592670d4a9fd9d4bb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2469 zcmV;W30n3?Nk%w1VGID+0QUd@Pi}Z@iHK=}eqe5GVt|7fGCp8_f;UW9RC0SzZ+TpL zfL&~BOI~6~T46zAaB+);N?c-AW@uz`Z#+<1c9M=(b$nQMeOhX2U~OtjZg_N$ifoFAL|0!wR9qD-I8R_?a*m5!dVg+)f<8m{L}YPQbbMH7X?T&2R%T~ZW@mMf zj&qQWMrCtzkBMe~_ub9Rx9bdZfrZFg~vi*t{RWrBoul8tMKh&oSNLSk@cgN1dGjZAEIOl)^w zeSuDGcS~z_cae@-cz#)Ues__LM`v^sDKv79jAVj@L}YSFX>@OlifV_4c94vAkd1SV zh;@*SO>B2_j*LcUb7g~tMP+hZd4F_`h)8L4UVMOBd46Ppgi~W@U3`E>W^!abtmlaEyy~l8i-Ua$0$RTX}wW zk&I=7gjsieOKf&ya%^3DfM9)ragB^gXmoUujdhTWbB~Q)eSu$mfnR-qa*vF0j*D=N zigApKc8`l?f`w#qY+`R~O>THvczr@uUSo1^YK4YVWM+4ej6YOcUwwjKet}=icTH?|O>K5;h=(*%U|xNIL1S=bgoJR7igApJFiKW3 zPhD$+e|M6MA^8LV00000EC2ui01N=w000R80P_eONU)&6g9sBUT*$DY!-o(fN}Ncs zqQ#3CGiuz(v7^V2AVWUXL$ajFlPF7~Sjn=b%a<@?%4Aufrp=o;bL!m5vnNgvK!XY$ zO0=laK1h=)UCK1+h^J7aN}USzkJYPKvueGnq^sAjT>*(5OIECmvuM+*UCR~^zkYbq zcIqU?AAF7gKg?@S8P`k~4?hOEO$kA?ub#4UP{KkYy(W^# zvCAs^1vo5N0uBv}kW0Z6dl9i059gBc!x}W; zMaLhLfN=wNkcC9V(xUfXgnIymHJ9yj*hwJ;01J%supgv(G*6jB^7Ow1IOQ z5cFVl4-m9bLDElGz;p#vM;$fNR6}3^1X<_swAWlSV1Wf>p4q~%Swgt;D zutVHyGZ6POcWWYd-kRwDy^P+Pgu_7J48%f4ESZpzN#ctuPR22YBV+h6$dG}|F|D*h zMk`V*A%zs1gWkjvtu#T#=SwuvdFKj@u7CndIMW0WufI;aGe9_lyY09;Lrd3oWp~f=e~kpb?BU$_InSHMjs{O$xzOlEOW};Brk0m7qg@C9_oGy*iZ` z@XRb-7?8pbyAFhKtRsD)V=Knn!WLOHacKn5;Qfdp6}0cb#g z2{ModTA<(r2`~%|#-W14m|zIuz(F_+ql3eUz!}biJ1U?}PFnr<@V2}k4 zb;t-t*wBYP1Va%2eW;98fMFFz?1nPH&Q7L#;@B}d_idIZ4{ngr!1F&Tg$)T5LED5WC; zuz-3jAeFCVB`i}J01k+tmLlK)2VQxET;|f2y8NXtH^6}b1e2J#+<-C%kcKoca{~j| zfHOtG%rxwxnFA1oGp$JsVq8-cyU^x0wXu&~Y{M42AO;$0xdx*u)&2?q(Y$&^#m8Nu?Q|KqM{eI=pv{g zhH=b63|tTcH6*ZzIdCB!5sK*>*A>|Hta~7KN*oknR@ zFb&g!Hp2)}FhdlK;0@e1BMQ5%!w{lS2Q%Q-xJEF8DTd&RxticIeZ~}hyy9FWm jKnOzUZ-4>ZUnuy)9|lJ7ffFnM0YIU_4|Xtw0|Ed${i-RK diff --git a/theme/identica/display.css b/theme/identica/display.css deleted file mode 100644 index 62d34f00e8..0000000000 --- a/theme/identica/display.css +++ /dev/null @@ -1,187 +0,0 @@ -/* CSS Document */ -/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ - -@import url(../default/display.css); - -html { - background: url(bg-body.gif) repeat-y top center #d8e2d7; -} - -body { - color: #193441; -} - -a { - color: #C15D42; -} - -#wrap { - background: url(bg-header.gif) repeat-x #FCFFF5; -} - -#header h1.pagetitle { - color: #d8e2d7; -} - -#header h2.sitename { - color: #FCFFF5; -} - -#nav li a { - color: #91AA9D; -} - -#nav_views li a { - color: #FCFFF5; - background-color: #91AA9D; - border-right: 1px solid #6A8787; -} - -#nav_views li.current a, #nav_views li.current a:hover { - color: #3F606F; - background-color: #FCFFF5; - border-right: 1px solid #6A8787; -} - -#nav_views li.current a:hover { - color: #193441; -} - -#nav_views li a:hover { - color: #FCFFF5; - background-color: #3F606F; - border-right: 1px solid #6A8787; - } - -#nav_sub { - border-top: 1px solid #D8E2D7; - } - -.instructions p, .success, .error { - border: 1px solid #91AA9D; - color: #FCFFF5; - } -.instructions a:hover, .success a:hover, .error a:hover { - color: #FCFFF5; - } - -#notices { - border-top: 1px solid #D8E2D7; - } - -.notice_single { - border-bottom: 1px solid #D8E2D7; -} - -.notice_single:hover { - background-color: #F3F8EA; - } - -input#submit_yes, input#submit_no { - color: #FCFFF5; - background-color: #C15D42; - } - -input#submit_yes:hover, input#submit_no:hover { - background-color: #904632; - } - -p.time a { - color: #91AA9D; - } - -#profile { - border-top: 1px solid #D8E2D7; - } - -#profile h2 { - color: #91AA9D; - } - -#nav_pagination li { - background-color: #91AA9D; - } - -#nav_pagination li a { - background-color: #91AA9D; - color: #FCFFF5; - } - -#nav_pagination li a:hover { - color: #FCFFF5; - } - -#footer { - border-top: 1px solid #D8E2D7; - } - -form input { - border: 1px solid #D8E2D7; - } - -input#submit, input.submit { - color: #FCFFF5; - background-color: #C15D42; - } - -input#submit:hover, input.submit:hover { - background-color: #904632; - } - -textarea, input { - color: #193441; - } - -textarea:focus, input:focus { - background-color: #f0f6eb; - } - -.input_instructions { - color: #91aa9d; - } - -#status_label { - color: #91AA9D; - } - -#status_textarea { - color: #193441; -} - -#status_submit { - background-color: #C15D42; - color: #FCFFF5; - } - -#status_submit:hover { - background-color: #904632; - } - -#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe { - background-color: #c15d42; - color: #fcfff5; - } - -#profiles { - border-top: 1px solid #D8E2D7; - } - -.profile_single { - border-bottom: 1px solid #D8E2D7; - } - -.profile_single:hover { - background-color: #F3F8EA; - } - -#messages { - border-top: 1px solid #D8E2D7; - } - -.message_single { - border-bottom: 1px solid #D8E2D7; - } - -.message_single:hover { - background-color: #F3F8EA; - } diff --git a/theme/identica/ie6.css b/theme/identica/ie6.css deleted file mode 100644 index a301f1dc5f..0000000000 --- a/theme/identica/ie6.css +++ /dev/null @@ -1,14 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ -@import url(../default/ie6.css); -#wrap { - background: url(bg-header.gif) repeat-x #FCFFF5; - } - - -input.disfavor, -input.favor { - text-indent:0px; - text-align:right; - padding-left:25px; -} \ No newline at end of file diff --git a/theme/identica/ie7.css b/theme/identica/ie7.css deleted file mode 100644 index cab6f4059c..0000000000 --- a/theme/identica/ie7.css +++ /dev/null @@ -1,3 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ -@import url(../default/ie7.css); diff --git a/theme/identica/login-bg.gif b/theme/identica/login-bg.gif deleted file mode 100644 index e2d8377db023a3915cc9e8c2f1f5c7462622f0a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmZ?wbhEHb6krfwxXQrr>({UQ_wR4qxN*;(J#*&FS-N!TvSrKGuV4S?%F;i7{_Nbj z^V6qK`}XadJ9qBs)2Dx~3p;V*#MZ4_j~qF&aN)v#|Nb2~aNyvg9 ztXT2$=g%EGcI@80`{m1*Z{NOs{rdIFl`EeF4W-ruOthu2f ztl_Mdp@*QzZPDcui{^-N`o3xq@(UMrZh5FF-w`Y#$*8QNq^Zf+5a!Y$(d{Fk$;RMZ d?jf!z+?DC8mZr!$-G@O{mX$wbm9ry*H2@d`j5z=R From c16ddd677588424f51d63d37ea9b3eb34c73c233 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 3 Feb 2009 16:31:41 -0800 Subject: [PATCH 4/5] trac1095 Profile page had bad alternate links for RSS and Atom feeds --- actions/showstream.php | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/actions/showstream.php b/actions/showstream.php index ecd9526353..90ffcacf9a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -170,26 +170,22 @@ class ShowstreamAction extends Action function showFeeds() { - // Feeds $this->element('link', array('rel' => 'alternate', - 'href' => common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'entity_timeline.rss', - 'argument' => $this->user->nickname)), - 'type' => 'application/rss+xml', - 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); - $this->element('link', array('rel' => 'alternate feed', - 'href' => common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'entity_timeline.atom', - 'argument' => $this->user->nickname)), - 'type' => 'application/atom+xml', - 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); - $this->element('link', array('rel' => 'alternate', - 'href' => common_local_url('userrss', array('nickname' => - $this->user->nickname)), - 'type' => 'application/rdf+xml', - 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname))); + 'type' => 'application/rss+xml', + 'href' => common_local_url('userrss', + array('nickname' => $this->user->nickname)), + 'title' => sprintf(_('Notice feed for %s (RSS)'), + $this->user->nickname))); + + $this->element('link', + array('rel' => 'alternate', + 'href' => common_local_url('api', + array('apiaction' => 'statuses', + 'method' => 'user_timeline.atom', + 'argument' => $this->user->nickname)), + 'type' => 'application/atom+xml', + 'title' => sprintf(_('Notice feed for %s (Atom)'), + $this->user->nickname))); } function extraHead() From 19724a51b3da1fb076ca47ce1ea7a4f229fa3b5d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 3 Feb 2009 21:22:41 -0800 Subject: [PATCH 5/5] trac533 Removed redundant calls to htmlspecialcharacters(). XMLWriter::writeAttribute() already takes care of the escaping for us, although that doesn't seem to be well documented. --- lib/htmloutputter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index f9245414f2..7780b1c19d 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -172,7 +172,7 @@ class HTMLOutputter extends XMLOutputter 'type' => 'text', 'id' => $id); if ($value) { - $attrs['value'] = htmlspecialchars($value); + $attrs['value'] = $value; } $this->element('input', $attrs); if ($instructions) { @@ -206,7 +206,7 @@ class HTMLOutputter extends XMLOutputter 'class' => 'checkbox', 'id' => $id); if ($value) { - $attrs['value'] = htmlspecialchars($value); + $attrs['value'] = $value; } if ($checked) { $attrs['checked'] = 'checked';