From 62dbfffe399333cd4a792cc77256a2bcd689a14f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 15 Apr 2011 17:15:40 +0200 Subject: [PATCH 1/3] darkzero theme, dark variant of duepuntozero --- view/theme/darkzero/border.jpg | Bin 0 -> 521 bytes view/theme/darkzero/head.jpg | Bin 0 -> 1269 bytes view/theme/darkzero/sectionend.jpg | Bin 0 -> 355 bytes view/theme/darkzero/shiny.png | Bin 0 -> 362 bytes view/theme/darkzero/style.css | 64 +++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 view/theme/darkzero/border.jpg create mode 100644 view/theme/darkzero/head.jpg create mode 100644 view/theme/darkzero/sectionend.jpg create mode 100644 view/theme/darkzero/shiny.png create mode 100644 view/theme/darkzero/style.css diff --git a/view/theme/darkzero/border.jpg b/view/theme/darkzero/border.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4967412bf49332e10ad40b4a1a751c3e7f97bdbb GIT binary patch literal 521 zcmex=LJ%Z3btM5{dxG z5Q+={Y5sqJL6C!?fPs;jQHg;`kdaxC@&6G9F|hj?kO4aU8BNHAbr$KTM4Dd?{?R(X(Y=)z&vcKWn~b-;io$UAQ~VpLtij?yULu9K2IE zK3`zLw(79m**DuZw7c9(7c>ZF^laI^^IgL9)4S(A<5JjcTFWIXoRDr`Ki;O^-g z@c%Z0GsvqH0gxdS835A!{{Vv^2SW`5D>I`K1Ct;lvmoRDBMj0&_XGV7@&pVpv9PkS zb8rDAwFMZMm>C#>p~J`tk!5CKWMXAw5E2m;<`5K9W><7hOkTM0;zyujQJ@_#BcL=B zP*`4&k%5t!1r%#Az{n&h6qI=BL-52!|8Fty04-+{WENzwXZT^~@-(o@FJD=m_pE+- z$I09^ymszNdk-C(Jmnzsu|)?>b#{4AySGuZZSwhKXAkLLJiBIf?|IDUHK#)6w%0uS zZD|ajC1*~)nXq*BWFK__{+^*!^>tjb+qRy|*AEOdG`i;I-y43ozPmDjT9F1GV5oOx9L#M!_7 z3QxWr>91UBzvlSbKkFuci?pA&eg6@wSMq1Y+OGFMPfvYj#g*fwY@YTmdHoK>3(Cii zmtWI97P_>vFiq^4bKH}%?}~n}u63lkrL=vQ)5i4W?0LGp;gQdlg&x{!=D)CS4j*rC?~Fya za#_Q)tZ)0ry|td~Zyq-_=1W>qWNAW2v%4|doC=i^DUN8jnn{n1yW%I#{w?Qt@@=Qw zXRrFm{^*~v>TfpH+veAIlwPr)rOUfs{@l6KXG(oLUDDp%JyZIf#fqik#=BofD^6|M zsHb!2&WY?hefOSd-i^A*v*OHzS?8_yJlhdaA{J;F5;uAFiIazmz3)CUiq2;CpLk+@ z!Nw&|4IDnM*x>7}H|gp2HC~BJKHs=-iS1vr-m*pSEe=mwF2`ZWh4ERR)vZ}M^POcaWTd5~4PCd~;#w0@ zzHQ##Tjgr=^7d-&d~xQ;rdJ0A+4|CWEk1a>zWB24{*EZM!p2&uT7x<7C-L0evUT5@ z(lg1fUEX5eYrlHEedQE$WM_wU*zr9_dsSuyWxX<*FI)HG`E9@JbC$ct+iZWk^x%G} ffAhcny=(RErfcRu`5*ro;!oMXzrQ?e`Tv^$d^)bm literal 0 HcmV?d00001 diff --git a/view/theme/darkzero/sectionend.jpg b/view/theme/darkzero/sectionend.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9d5d5c8f3be6059bde488b340c9c9e4207a3e977 GIT binary patch literal 355 zcmex=LJ%Z3btM5{dxG z5Q+={Y5sqJL6Cz%l7W$#QHg;`kdaxC@&6G9aj@eUkO3Pj7f?b*fPsmTl@VEjQG_Wd zanhm>Kv^-6iO6ycj0{XbaXCSt`7F#xGK>t0iGqQJ6CD>G{C|sqhZ(3&kXewyp5d8T k^yd{q#>OX9On)DFT=Z$O=;<^bg|xQk{c3!t!vEg{06lv(JOBUy literal 0 HcmV?d00001 diff --git a/view/theme/darkzero/shiny.png b/view/theme/darkzero/shiny.png new file mode 100644 index 0000000000000000000000000000000000000000..994c0d05d730d7302a6de1298ba2e6514b1b2b1f GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^{2DD*GD0X#=CwqOyN|ANrXCgtsO~{o7Kx>VR49a!E110l tt5Y-2UBA!rY|*rqD|U=*i^{m~zTrK5!YQLoO7=6zm!7VEF6*2UngHobgVX>3 literal 0 HcmV?d00001 diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css new file mode 100644 index 0000000000..c92529f266 --- /dev/null +++ b/view/theme/darkzero/style.css @@ -0,0 +1,64 @@ +@import url('../duepuntozero/style.css'); + +/* dark variation Fabio Comuni */ + +a:link, a:visited { color: #99CCFF; text-decoration: none; } +a:hover {text-decoration: underline; } + +input, select, textarea { + background-color: #222222; + color: #FFFFFF; + border: 1px solid #444444; +} +.openid { background-color: #222222;} + +body { background-color: #222222; color: #cccccc; background-image: url(head.jpg); } +aside{ background-image: url(border.jpg); padding-bottom: 0px; } +section { background-color: #333333; background-image: url(border.jpg); } + + +#profile-tabs-wrapper { background-image: url(head.jpg); } +div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); } + +nav #banner #logo-text a { color: #ffffff; } + +.wall-item-content-wrapper { border: 1px solid #444444; } +.wall-item-tools { background-color: #444444; background-image: none;} +.comment-edit-wrapper{ background-color: #333333; } +.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} +.photo-top-album-name{ background-color: #333333; } +.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; } + +.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px} +.nav-commlink, .nav-login-link {background-color: #b7bab3;} +.nav-commlink:link, .nav-commlink:visited, +.nav-login-link:link, .nav-login-link:visited{ + color: #ffffff; +} + +.fakelink, .fakelink:visited { + color: #99CCFF; +} + +.wall-item-name-link { + color: #99CCFF; +} + +.wall-item-photo-menu li a { + color: #CCCCCC; background-color: #333333; +} + +.wall-item-photo-menu li a:hover { + background-color: #CCCCCC; color: #333333; +} +#page-footer { min-height: 1em;} +footer { + margin: 0px 10%; + display: block; + background-image: url('sectionend.jpg'); + background-position: top left; + background-repeat: repeat-x; + height: 25px; +} + + From 60fbe0b39b02e9d1ce4521883c86b4783f4b9d4e Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 18 Apr 2011 17:37:02 +0200 Subject: [PATCH 2/3] translate verb items at display time --- include/conversation.php | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 4c858d8187..a1ce19a7ab 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,5 +1,34 @@ $item['id'], '$delete' => t('Delete'))); - + // + localize_item($item); $drop = replace_macros($droptpl,array('$id' => $item['id'])); $lock = '
'; @@ -384,6 +413,9 @@ function conversation(&$a, $items, $mode, $update) { if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; + // + localize_item($item); + // Build the HTML $tmp_item = replace_macros($template,array( From 1d8bd89fece18e861760eeed40ded146e01a0abb Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Mon, 18 Apr 2011 20:38:48 +0200 Subject: [PATCH 3/3] translate "like"/"dislike"/"friends with" messages at print time --- include/conversation.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a1ce19a7ab..3ec0706e9d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -8,12 +8,18 @@ function localize_item(&$item){ if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" || $item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){ + $r = q("SELECT * from `item`,`contact` WHERE + `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", + dbesc($item['parent-uri'])); + if(count($r)==0) return; + $obj=$r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; - #$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - #$objlink = preg_grep("|