Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
10b0ce5861
18 changed files with 304 additions and 48 deletions
12
boot.php
12
boot.php
|
|
@ -349,12 +349,22 @@ if(! class_exists('App')) {
|
||||||
public $plugins;
|
public $plugins;
|
||||||
public $apps = array();
|
public $apps = array();
|
||||||
public $identities;
|
public $identities;
|
||||||
public $sourcename = '';
|
|
||||||
|
|
||||||
public $nav_sel;
|
public $nav_sel;
|
||||||
|
|
||||||
public $category;
|
public $category;
|
||||||
|
|
||||||
|
// Allow themes to control internal parameters
|
||||||
|
// by changing App values in theme.php
|
||||||
|
//
|
||||||
|
// Possibly should make these part of the plugin
|
||||||
|
// system, but it seems like overkill to invoke
|
||||||
|
// all the plugin machinery just to change a couple
|
||||||
|
// of values
|
||||||
|
public $sourcename = '';
|
||||||
|
public $videowidth = 425;
|
||||||
|
public $videoheight = 350;
|
||||||
|
|
||||||
private $scheme;
|
private $scheme;
|
||||||
private $hostname;
|
private $hostname;
|
||||||
private $baseurl;
|
private $baseurl;
|
||||||
|
|
|
||||||
|
|
@ -325,7 +325,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
|
|
||||||
// Try to Oembed
|
// Try to Oembed
|
||||||
if ($tryoembed) {
|
if ($tryoembed) {
|
||||||
$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
|
$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text);
|
||||||
$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
|
$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
|
||||||
|
|
||||||
$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
|
$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
|
||||||
|
|
@ -339,7 +339,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
|
|
||||||
|
|
||||||
if ($tryoembed)
|
if ($tryoembed)
|
||||||
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
|
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></iframe>', $Text);
|
||||||
else
|
else
|
||||||
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1">$1</a>', $Text);
|
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1">$1</a>', $Text);
|
||||||
|
|
||||||
|
|
@ -355,7 +355,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
|
$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
|
||||||
|
|
||||||
if ($tryoembed)
|
if ($tryoembed)
|
||||||
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
|
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
|
||||||
else
|
else
|
||||||
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
|
$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
|
||||||
|
|
||||||
|
|
@ -369,7 +369,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
|
$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
|
||||||
|
|
||||||
if ($tryoembed)
|
if ($tryoembed)
|
||||||
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="425" height="350" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
|
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
|
||||||
else
|
else
|
||||||
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
|
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,9 @@ function oembed_replacecb($matches){
|
||||||
|
|
||||||
function oembed_fetch_url($embedurl){
|
function oembed_fetch_url($embedurl){
|
||||||
|
|
||||||
$txt = Cache::get($embedurl);
|
$a = get_app();
|
||||||
|
|
||||||
|
$txt = Cache::get($a->videowidth . $embedurl);
|
||||||
|
|
||||||
// These media files should now be caught in bbcode.php
|
// These media files should now be caught in bbcode.php
|
||||||
// left here as a fallback in case this is called from another source
|
// left here as a fallback in case this is called from another source
|
||||||
|
|
@ -38,7 +40,7 @@ function oembed_fetch_url($embedurl){
|
||||||
$entries = $xpath->query("//link[@type='application/json+oembed']");
|
$entries = $xpath->query("//link[@type='application/json+oembed']");
|
||||||
foreach($entries as $e){
|
foreach($entries as $e){
|
||||||
$href = $e->getAttributeNode("href")->nodeValue;
|
$href = $e->getAttributeNode("href")->nodeValue;
|
||||||
$txt = fetch_url($href . '&maxwidth=425');
|
$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -47,7 +49,7 @@ function oembed_fetch_url($embedurl){
|
||||||
|
|
||||||
if ($txt==false || $txt==""){
|
if ($txt==false || $txt==""){
|
||||||
// try oohembed service
|
// try oohembed service
|
||||||
$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';
|
$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
|
||||||
$txt = fetch_url($ourl);
|
$txt = fetch_url($ourl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -55,7 +57,7 @@ function oembed_fetch_url($embedurl){
|
||||||
if ($txt[0]!="{") $txt='{"type":"error"}';
|
if ($txt[0]!="{") $txt='{"type":"error"}';
|
||||||
|
|
||||||
//save in cache
|
//save in cache
|
||||||
Cache::set($embedurl,$txt);
|
Cache::set($a->videowidth . $embedurl,$txt);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 20 KiB |
|
|
@ -43,6 +43,58 @@
|
||||||
is_visible="true"
|
is_visible="true"
|
||||||
teeth="10"
|
teeth="10"
|
||||||
phi="10" />
|
phi="10" />
|
||||||
|
<inkscape:path-effect
|
||||||
|
effect="gears"
|
||||||
|
id="path-effect4050-9"
|
||||||
|
is_visible="true"
|
||||||
|
teeth="10"
|
||||||
|
phi="10" />
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-8">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-4" />
|
||||||
|
</filter>
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-7">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-9" />
|
||||||
|
</filter>
|
||||||
|
<inkscape:path-effect
|
||||||
|
effect="gears"
|
||||||
|
id="path-effect4050-9-1"
|
||||||
|
is_visible="true"
|
||||||
|
teeth="10"
|
||||||
|
phi="10" />
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-8-9">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-4-4" />
|
||||||
|
</filter>
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-7-3">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-9-2" />
|
||||||
|
</filter>
|
||||||
</defs>
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
|
|
@ -51,26 +103,28 @@
|
||||||
borderopacity="1.0"
|
borderopacity="1.0"
|
||||||
inkscape:pageopacity="0"
|
inkscape:pageopacity="0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.9403009"
|
inkscape:zoom="2.7164213"
|
||||||
inkscape:cx="127.81563"
|
inkscape:cx="79.895323"
|
||||||
inkscape:cy="128.63003"
|
inkscape:cy="76.322411"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="true"
|
showgrid="true"
|
||||||
showguides="true"
|
showguides="true"
|
||||||
inkscape:guide-bbox="true"
|
inkscape:guide-bbox="true"
|
||||||
inkscape:snap-global="false"
|
inkscape:snap-global="false"
|
||||||
inkscape:window-width="1065"
|
inkscape:window-width="1148"
|
||||||
inkscape:window-height="742"
|
inkscape:window-height="452"
|
||||||
inkscape:window-x="40"
|
inkscape:window-x="0"
|
||||||
inkscape:window-y="50"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="0"
|
inkscape:window-maximized="0"
|
||||||
width="0px"
|
width="0px"
|
||||||
height="0px"
|
height="0px"
|
||||||
fit-margin-top="0"
|
fit-margin-top="0"
|
||||||
fit-margin-left="0"
|
fit-margin-left="0"
|
||||||
fit-margin-right="0"
|
fit-margin-right="0"
|
||||||
fit-margin-bottom="0">
|
fit-margin-bottom="0"
|
||||||
|
inkscape:showpageshadow="false"
|
||||||
|
showborder="true">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
type="xygrid"
|
type="xygrid"
|
||||||
id="grid4016"
|
id="grid4016"
|
||||||
|
|
@ -107,7 +161,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title />
|
<dc:title></dc:title>
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
@ -117,7 +171,7 @@
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(0,-852.36218)">
|
transform="translate(0,-852.36218)">
|
||||||
<rect
|
<rect
|
||||||
transform="matrix(1,0,0,0.84848485,44,217.14578)"
|
transform="matrix(2.5239206,0,0,0.84848485,21.386213,217.14578)"
|
||||||
inkscape:export-ydpi="90"
|
inkscape:export-ydpi="90"
|
||||||
inkscape:export-xdpi="90"
|
inkscape:export-xdpi="90"
|
||||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
|
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
|
||||||
|
|
@ -2109,5 +2163,61 @@
|
||||||
d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
|
d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
|
||||||
style="fill:#1a1a1a" />
|
style="fill:#1a1a1a" />
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
id="g4021">
|
||||||
|
<rect
|
||||||
|
ry="6"
|
||||||
|
rx="6"
|
||||||
|
y="18.790752"
|
||||||
|
x="470.35715"
|
||||||
|
height="44.285713"
|
||||||
|
width="44.285713"
|
||||||
|
id="rect196-0"
|
||||||
|
style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7)"
|
||||||
|
transform="matrix(0.43114968,0,0,0.43114968,-113.62924,933.71148)" />
|
||||||
|
<path
|
||||||
|
transform="matrix(0.26322611,0,0,0.26322611,-27.639493,937.40175)"
|
||||||
|
inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
|
||||||
|
inkscape:path-effect="#path-effect4050-9"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path4072-5"
|
||||||
|
d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
|
||||||
|
style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8)" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
|
d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
|
||||||
|
id="path4208-6"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,88.473928,863.40819)"
|
||||||
|
sodipodi:nodetypes="cccccccccccccccccc" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g4016">
|
||||||
|
<rect
|
||||||
|
ry="6"
|
||||||
|
rx="6"
|
||||||
|
y="18.790752"
|
||||||
|
x="470.35715"
|
||||||
|
height="44.285713"
|
||||||
|
width="44.285713"
|
||||||
|
id="rect196-0-0"
|
||||||
|
style="fill:#2e2f2e;stroke:#d3d7cf;stroke-width:2.05356860000000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7-3);fill-opacity:1"
|
||||||
|
transform="matrix(0.43114968,0,0,0.43114968,-91.3641,933.9484)" />
|
||||||
|
<path
|
||||||
|
transform="matrix(0.26322611,0,0,0.26322611,-5.37436,937.63865)"
|
||||||
|
inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
|
||||||
|
inkscape:path-effect="#path-effect4050-9-1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path4072-5-1"
|
||||||
|
d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
|
||||||
|
style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8-9)" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
|
d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
|
||||||
|
id="path4208-6-0"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,110.73906,863.64511)"
|
||||||
|
sodipodi:nodetypes="cccccccccccccccccc" />
|
||||||
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 129 KiB |
|
|
@ -90,7 +90,7 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin
|
||||||
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
||||||
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
||||||
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
||||||
#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
|
#nav-manage-link{background-position:-88px -88px;}#nav-manage-link:hover{background-position:-110px -88px;}
|
||||||
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
||||||
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||||
#nav-notify-link:hover{background-position:-66px -110px;}
|
#nav-notify-link:hover{background-position:-66px -110px;}
|
||||||
|
|
|
||||||
|
|
@ -542,9 +542,9 @@ nav .nav-link {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-manage-link {
|
#nav-manage-link {
|
||||||
background-position: 0px -22px;
|
background-position: -88px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
background-position: -22px -22px;
|
background-position: -110px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-messages-link {
|
#nav-messages-link {
|
||||||
|
|
|
||||||
|
|
@ -2,27 +2,30 @@
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<base href="$baseurl/" />
|
<base href="$baseurl/" />
|
||||||
<meta name="generator" content="$generator" />
|
<meta name="generator" content="$generator" />
|
||||||
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
|
|
||||||
<link rel="search" href="$baseurl/opensearch"
|
|
||||||
type="application/opensearchdescription+xml" title="Search in Friendica" />
|
|
||||||
<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
|
||||||
<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
|
||||||
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
|
||||||
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
|
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
|
||||||
|
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
|
||||||
|
<link rel="search"
|
||||||
|
href="$baseurl/opensearch"
|
||||||
|
type="application/opensearchdescription+xml"
|
||||||
|
title="Search in Friendica" />
|
||||||
|
|
||||||
<!--[if IE]>
|
<!--[if IE]>
|
||||||
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
<script type="text/javascript" src="$baseurl/js/jquery.js"></script>
|
<script type="text/javascript" src="$baseurl/js/jquery.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/js/acl.js"></script>
|
|
||||||
<script type="text/javascript" src="$baseurl/js/main.js"></script>
|
|
||||||
<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
|
<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
|
<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
|
<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
|
<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
|
<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
|
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
|
||||||
|
<script type="text/javascript" src="$baseurl/js/acl.js"></script>
|
||||||
<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
|
<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
|
||||||
<!-- in dispy-dark -->
|
<script type="text/javascript" src="$baseurl/js/main.js"></script>
|
||||||
|
<!-- in dispy -->
|
||||||
<script>
|
<script>
|
||||||
var updateInterval = $update_interval;
|
var updateInterval = $update_interval;
|
||||||
var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
|
var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
|
||||||
|
|
@ -47,6 +50,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function commentInsert(obj,id) {
|
function commentInsert(obj,id) {
|
||||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||||
if(tmpStr == '$comment') {
|
if(tmpStr == '$comment') {
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 4.2 KiB |
|
|
@ -1,5 +1,5 @@
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var editor = false;
|
var editor=false;
|
||||||
var textlen = 0;
|
var textlen = 0;
|
||||||
var plaintext = '$editselect';
|
var plaintext = '$editselect';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
<form id="profile-jot-form" action="$action" method="post">
|
<form id="profile-jot-form" action="$action" method="post">
|
||||||
<div id="jot">
|
<div id="jot">
|
||||||
<div id="profile-jot-desc" class="jothidden"> </div>
|
<div id="profile-jot-desc" class="jothidden"> </div>
|
||||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
|
|
||||||
<div id="character-counter" class="grey jothidden"></div>
|
|
||||||
|
|
||||||
<input type="hidden" name="type" value="$ptyp" />
|
<input type="hidden" name="type" value="$ptyp" />
|
||||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||||
|
|
@ -11,11 +9,13 @@
|
||||||
<input type="hidden" name="coord" id="jot-coord" value="" />
|
<input type="hidden" name="coord" id="jot-coord" value="" />
|
||||||
<input type="hidden" name="post_id" value="$post_id" />
|
<input type="hidden" name="post_id" value="$post_id" />
|
||||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||||
|
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
|
||||||
|
<div id="character-counter" class="grey jothidden"></div>
|
||||||
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
|
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
|
||||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
|
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
|
||||||
</textarea>
|
</textarea>
|
||||||
|
|
||||||
|
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||||
<div id="jot-tools" class="jothidden" style="display:none">
|
<div id="jot-tools" class="jothidden" style="display:none">
|
||||||
<div id="profile-jot-submit-wrapper" class="jothidden">
|
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||||
|
|
||||||
|
|
@ -68,6 +68,9 @@
|
||||||
$jotnets
|
$jotnets
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="profile-jot-end"></div>
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
{{ if $content }}<script>initEditor();</script>{{ endif }}
|
{{ if $content }}<script>initEditor();</script>{{ endif }}
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
|
@ -14,9 +14,9 @@
|
||||||
height="200"
|
height="200"
|
||||||
id="svg3403"
|
id="svg3403"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48+devel r"
|
inkscape:version="0.48.3.1 r9886"
|
||||||
sodipodi:docname="icons.svg"
|
sodipodi:docname="icons.svg"
|
||||||
inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png"
|
inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/light/icons.png"
|
||||||
inkscape:export-xdpi="90"
|
inkscape:export-xdpi="90"
|
||||||
inkscape:export-ydpi="90">
|
inkscape:export-ydpi="90">
|
||||||
<defs
|
<defs
|
||||||
|
|
@ -43,6 +43,58 @@
|
||||||
is_visible="true"
|
is_visible="true"
|
||||||
teeth="10"
|
teeth="10"
|
||||||
phi="10" />
|
phi="10" />
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-7-3">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-9-2" />
|
||||||
|
</filter>
|
||||||
|
<inkscape:path-effect
|
||||||
|
effect="gears"
|
||||||
|
id="path-effect4050-9-1"
|
||||||
|
is_visible="true"
|
||||||
|
teeth="10"
|
||||||
|
phi="10" />
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-8-9">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-4-4" />
|
||||||
|
</filter>
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-7-3-9">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-9-2-0" />
|
||||||
|
</filter>
|
||||||
|
<inkscape:path-effect
|
||||||
|
effect="gears"
|
||||||
|
id="path-effect4050-9-1-5"
|
||||||
|
is_visible="true"
|
||||||
|
teeth="10"
|
||||||
|
phi="10" />
|
||||||
|
<filter
|
||||||
|
color-interpolation-filters="sRGB"
|
||||||
|
inkscape:collect="always"
|
||||||
|
id="filter4064-8-9-6">
|
||||||
|
<feBlend
|
||||||
|
inkscape:collect="always"
|
||||||
|
mode="lighten"
|
||||||
|
in2="BackgroundImage"
|
||||||
|
id="feBlend4066-4-4-7" />
|
||||||
|
</filter>
|
||||||
</defs>
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
|
|
@ -52,18 +104,18 @@
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.9403009"
|
inkscape:zoom="1.9403009"
|
||||||
inkscape:cx="64.725266"
|
inkscape:cx="76.608548"
|
||||||
inkscape:cy="108.36719"
|
inkscape:cy="117.37905"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="true"
|
showgrid="true"
|
||||||
showguides="true"
|
showguides="true"
|
||||||
inkscape:guide-bbox="true"
|
inkscape:guide-bbox="true"
|
||||||
inkscape:snap-global="false"
|
inkscape:snap-global="false"
|
||||||
inkscape:window-width="1065"
|
inkscape:window-width="1148"
|
||||||
inkscape:window-height="742"
|
inkscape:window-height="792"
|
||||||
inkscape:window-x="40"
|
inkscape:window-x="0"
|
||||||
inkscape:window-y="50"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="0">
|
inkscape:window-maximized="0">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
type="xygrid"
|
type="xygrid"
|
||||||
|
|
@ -101,7 +153,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title />
|
<dc:title></dc:title>
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
@ -1482,7 +1534,7 @@
|
||||||
id="path4166" />
|
id="path4166" />
|
||||||
</g>
|
</g>
|
||||||
<rect
|
<rect
|
||||||
transform="matrix(1,0,0,0.84848485,44,217.14578)"
|
transform="matrix(1.9980186,0,0,0.84848485,44,217.14578)"
|
||||||
inkscape:export-ydpi="90"
|
inkscape:export-ydpi="90"
|
||||||
inkscape:export-xdpi="90"
|
inkscape:export-xdpi="90"
|
||||||
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
|
inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
|
||||||
|
|
@ -2186,5 +2238,59 @@
|
||||||
d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
|
d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
|
||||||
style="fill:#1a1a1a" />
|
style="fill:#1a1a1a" />
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
transform="translate(-21.97338,-0.48160397)"
|
||||||
|
id="g4016">
|
||||||
|
<rect
|
||||||
|
ry="6"
|
||||||
|
rx="6"
|
||||||
|
y="18.790752"
|
||||||
|
x="470.35715"
|
||||||
|
height="44.285713"
|
||||||
|
width="44.285713"
|
||||||
|
id="rect196-0-0"
|
||||||
|
style="fill:#2e2f2e;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7-3)"
|
||||||
|
transform="matrix(0.43114968,0,0,0.43114968,-91.3641,933.9484)" />
|
||||||
|
<path
|
||||||
|
transform="matrix(0.26322611,0,0,0.26322611,-5.37436,937.63865)"
|
||||||
|
inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
|
||||||
|
inkscape:path-effect="#path-effect4050-9-1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path4072-5-1"
|
||||||
|
d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
|
||||||
|
style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8-9)" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
|
d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
|
||||||
|
id="path4208-6-0"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,110.73906,863.64511)"
|
||||||
|
sodipodi:nodetypes="cccccccccccccccccc" />
|
||||||
|
</g>
|
||||||
|
<rect
|
||||||
|
transform="matrix(0.43114968,0,0,0.43114968,-91.46425,933.55802)"
|
||||||
|
style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.05356860000000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7-3-9)"
|
||||||
|
id="rect196-0-0-7"
|
||||||
|
width="44.285713"
|
||||||
|
height="44.285713"
|
||||||
|
x="470.35715"
|
||||||
|
y="18.790752"
|
||||||
|
rx="6"
|
||||||
|
ry="6" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8-9-6)"
|
||||||
|
d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
|
||||||
|
id="path4072-5-1-7"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
inkscape:path-effect="#path-effect4050-9-1-5"
|
||||||
|
inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
|
||||||
|
transform="matrix(0.26322611,0,0,0.26322611,-5.4745096,937.24827)" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cccccccccccccccccc"
|
||||||
|
transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,110.63891,863.25473)"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path4208-6-0-2"
|
||||||
|
d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
|
||||||
|
style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 128 KiB |
|
|
@ -90,7 +90,7 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin
|
||||||
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
|
||||||
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
|
||||||
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
|
||||||
#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
|
#nav-manage-link{background-position:-88px -88px;}#nav-manage-link:hover{background-position:-110px -88px;}
|
||||||
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
|
||||||
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||||
#nav-notify-link:hover{background-position:-66px -110px;}
|
#nav-notify-link:hover{background-position:-66px -110px;}
|
||||||
|
|
|
||||||
|
|
@ -543,9 +543,9 @@ nav .nav-link {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-manage-link {
|
#nav-manage-link {
|
||||||
background-position: 0px -22px;
|
background-position: -88px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
background-position: -22px -22px;
|
background-position: -110px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-messages-link {
|
#nav-messages-link {
|
||||||
|
|
|
||||||
19
view/theme/frost-mobile/profile_photo.tpl
Normal file
19
view/theme/frost-mobile/profile_photo.tpl
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
<h1>$title</h1>
|
||||||
|
|
||||||
|
<form enctype="multipart/form-data" action="profile_photo" method="post">
|
||||||
|
<input type='hidden' name='form_security_token' value='$form_security_token'>
|
||||||
|
|
||||||
|
<div id="profile-photo-upload-wrapper">
|
||||||
|
<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
|
||||||
|
<input name="userfile" type="file" id="profile-photo-upload" size="25" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="profile-photo-submit-wrapper">
|
||||||
|
<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div id="profile-photo-link-select-wrapper">
|
||||||
|
$select
|
||||||
|
</div>
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
* Name: Frost--mobile version
|
* Name: Frost--mobile version
|
||||||
* Description: Like frosted glass
|
* Description: Like frosted glass
|
||||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||||
* Version: Version 0.2.3
|
* Version: Version 0.2.4
|
||||||
* Author: Zach P <windforest@f.shmuz.in>
|
* Author: Zach P <windforest@f.shmuz.in>
|
||||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||||
*/
|
*/
|
||||||
|
|
@ -24,5 +24,7 @@ function frost_mobile_init(&$a) {
|
||||||
|
|
||||||
|
|
||||||
$a->sourcename = 'Friendica mobile web';
|
$a->sourcename = 'Friendica mobile web';
|
||||||
|
$a->videowidth = 250;
|
||||||
|
$a->videoheight = 200;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,12 +18,12 @@
|
||||||
<ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
<ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||||
$item.item_photo_menu
|
$item.item_photo_menu
|
||||||
</ul>
|
</ul>
|
||||||
<!-- </div>-->
|
</div>-->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!--<div class="wall-item-photo-end"></div>-->
|
<!--<div class="wall-item-photo-end"></div>-->
|
||||||
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
|
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
|
||||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
|
||||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||||
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
|
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue