Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup
This commit is contained in:
Michael Vogel
commit
62b32e7c93
|
|
@ -664,6 +664,12 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
|
|||
return($username);
|
||||
}
|
||||
|
||||
function bb_DiasporaLinks($match) {
|
||||
$a = get_app();
|
||||
|
||||
return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
|
||||
}
|
||||
|
||||
function bb_RemovePictureLinks($match) {
|
||||
$text = Cache::get($match[1]);
|
||||
|
||||
|
|
@ -880,6 +886,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
|||
else
|
||||
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text);
|
||||
|
||||
// Handle Diaspora posts
|
||||
$Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
|
||||
|
||||
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
|
||||
if (!$forplaintext)
|
||||
$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text);
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ function diaspora_request($importer,$xml) {
|
|||
intval($importer['uid'])
|
||||
);
|
||||
|
||||
if((count($r)) && (! $r[0]['hide-friends']) && (! $contact['hidden'])) {
|
||||
if((count($r)) && (!$r[0]['hide-friends']) && (!$contact['hidden']) && intval(get_pconfig($importer['uid'],'system','post_newfriend'))) {
|
||||
require_once('include/items.php');
|
||||
|
||||
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||
|
|
|
|||
|
|
@ -23,12 +23,15 @@ function notification($params) {
|
|||
$site_admin = sprintf( t('%s Administrator'), $sitename);
|
||||
$nickname = "";
|
||||
|
||||
$sender_name = $product;
|
||||
$sender_name = $sitename;
|
||||
$hostname = $a->get_hostname();
|
||||
if(strpos($hostname,':'))
|
||||
$hostname = substr($hostname,0,strpos($hostname,':'));
|
||||
|
||||
$sender_email = t('noreply') . '@' . $hostname;
|
||||
|
||||
$sender_email = $a->config['sender_email'];
|
||||
if (empty($sender_email)) {
|
||||
$sender_email = t('noreply') . '@' . $hostname;
|
||||
}
|
||||
|
||||
$user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid']));
|
||||
if ($user)
|
||||
|
|
|
|||
|
|
@ -2715,6 +2715,10 @@ function item_is_remote_self($contact, &$datarray) {
|
|||
if ($datarray["app"] == $a->get_hostname())
|
||||
return false;
|
||||
|
||||
// Only forward posts
|
||||
if ($datarray["verb"] != ACTIVITY_POST)
|
||||
return false;
|
||||
|
||||
if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
|
||||
return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -121,6 +121,8 @@ function admin_content(&$a) {
|
|||
}
|
||||
|
||||
$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
|
||||
$aside['diagnostics_probe'] = Array($a->get_baseurl(true).'/probe/', t('probe addresse'), 'probe');
|
||||
$aside['diagnostics_webfinger'] = Array($a->get_baseurl(true).'/webfinger/', t('check webfinger'), 'webfinger');
|
||||
|
||||
$t = get_markup_template("admin_aside.tpl");
|
||||
$a->page['aside'] .= replace_macros( $t, array(
|
||||
|
|
@ -128,6 +130,7 @@ function admin_content(&$a) {
|
|||
'$admtxt' => t('Admin'),
|
||||
'$plugadmtxt' => t('Plugin Features'),
|
||||
'$logtxt' => t('Logs'),
|
||||
'$diagnosticstxt' => t('diagnostics'),
|
||||
'$h_pending' => t('User registrations waiting for confirmation'),
|
||||
'$admurl'=> $a->get_baseurl(true)."/admin/"
|
||||
));
|
||||
|
|
@ -278,7 +281,7 @@ function admin_page_site_post(&$a){
|
|||
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
|
||||
$r = q($q);
|
||||
if (!$r) {
|
||||
notice( "Falied updating '$table_name': " . $db->error );
|
||||
notice( "Failed updating '$table_name': " . $db->error );
|
||||
goaway($a->get_baseurl(true) . '/admin/site' );
|
||||
}
|
||||
}
|
||||
|
|
@ -309,6 +312,7 @@ function admin_page_site_post(&$a){
|
|||
|
||||
$sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : '');
|
||||
$hostname = ((x($_POST,'hostname')) ? notags(trim($_POST['hostname'])) : '');
|
||||
$sender_email = ((x($_POST,'sender_email')) ? notags(trim($_POST['sender_email'])) : '');
|
||||
$banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
|
||||
$info = ((x($_POST,'info')) ? trim($_POST['info']) : false);
|
||||
$language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
|
||||
|
|
@ -415,6 +419,7 @@ function admin_page_site_post(&$a){
|
|||
set_config('system','maxloadavg',$maxloadavg);
|
||||
set_config('config','sitename',$sitename);
|
||||
set_config('config','hostname',$hostname);
|
||||
set_config('config','sender_email', $sender_email);
|
||||
set_config('system','suppress_language',$suppress_language);
|
||||
if ($banner==""){
|
||||
// don't know why, but del_config doesn't work...
|
||||
|
|
@ -605,6 +610,7 @@ function admin_page_site(&$a) {
|
|||
// name, label, value, help string, extra data...
|
||||
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
|
||||
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
|
||||
'$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"),
|
||||
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
|
||||
'$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')),
|
||||
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
<?php
|
||||
|
||||
function noscrape_init(&$a) {
|
||||
|
||||
|
||||
if(get_config('system','disable_noscrape'))
|
||||
killme();
|
||||
|
||||
|
||||
if($a->argc > 1)
|
||||
$which = $a->argv[1];
|
||||
else
|
||||
else
|
||||
killme();
|
||||
|
||||
|
||||
$profile = 0;
|
||||
if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
|
||||
$which = $a->user['nickname'];
|
||||
$profile = $a->argv[1];
|
||||
}
|
||||
|
||||
|
||||
profile_load($a,$which,$profile);
|
||||
|
||||
|
||||
if(!$a->profile['net-publish'])
|
||||
killme();
|
||||
|
||||
|
||||
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
|
||||
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
|
||||
$keywords = explode(',', $keywords);
|
||||
|
||||
|
||||
$json_info = array(
|
||||
'fn' => $a->profile['name'],
|
||||
'key' => $a->profile['pubkey'],
|
||||
|
|
@ -33,19 +33,19 @@ function noscrape_init(&$a) {
|
|||
'photo' => $a->profile['photo'],
|
||||
'tags' => $keywords
|
||||
);
|
||||
|
||||
|
||||
//These are optional fields.
|
||||
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital');
|
||||
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
|
||||
foreach($profile_fields as $field)
|
||||
if(!empty($a->profile[$field])) $json_info["$field"] = $a->profile[$field];
|
||||
|
||||
|
||||
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
|
||||
foreach($dfrn_pages as $dfrn)
|
||||
$json_info["dfrn-{$dfrn}"] = $a->get_baseurl()."/dfrn_{$dfrn}/{$which}";
|
||||
|
||||
|
||||
//Output all the JSON!
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
echo json_encode($json_info);
|
||||
exit;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
13797
view/pt-br/messages.po
13797
view/pt-br/messages.po
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -40,3 +40,8 @@
|
|||
<li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
|
||||
</ul>
|
||||
|
||||
<h4>{{$diagnosticstxt}}</h4>
|
||||
<ul class'admin linklist'>
|
||||
<li class='admin link {{$admin.diagnostics_probe.2}}'><a href="{{$admin.diagnostics_probe.0}}">{{$admin.diagnostics_probe.1}}</a></li>
|
||||
<li class='admin link {{$admin.diagnostics_webfinger.2}}'><a href="{{$admin.diagnostics_webfinger.0}}">{{$admin.diagnostics_webfinger.1}}</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
|
||||
{{include file="field_input.tpl" field=$sitename}}
|
||||
{{include file="field_input.tpl" field=$hostname}}
|
||||
{{include file="field_input.tpl" field=$sender_email}}
|
||||
{{include file="field_textarea.tpl" field=$banner}}
|
||||
{{include file="field_textarea.tpl" field=$info}}
|
||||
{{include file="field_select.tpl" field=$language}}
|
||||
|
|
|
|||
661
view/theme/vier/LICENSE
Normal file
661
view/theme/vier/LICENSE
Normal file
|
|
@ -0,0 +1,661 @@
|
|||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
4
view/theme/vier/README.md
Normal file
4
view/theme/vier/README.md
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
vier
|
||||
====
|
||||
|
||||
Friendica theme "vier"
|
||||
|
|
@ -320,6 +320,7 @@ li.icon.icon-large:before {
|
|||
.icon-sitemap:before { content: "\f0e8"; }
|
||||
.icon-umbrella:before { content: "\f0e9"; }
|
||||
.icon-paste:before { content: "\f0ea"; }
|
||||
.icon-sliders:before { content: "\f1de"; }
|
||||
|
||||
.icon-user-md:before { content: "\f200"; }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
*{
|
||||
box-shadow: 0 0 0 0 !important;
|
||||
border-color: #EAEAEA !important;
|
||||
}
|
||||
|
||||
nav { background-color: #27333F !important; }
|
||||
aside { background-color: #EAEEF4 !important }
|
||||
|
||||
*{ box-shadow: 0 0 0 0 !important;}
|
||||
body, section { background-color: #ffffff !important;}
|
||||
#profile-jot-form { background-color: #ffffff !important;}
|
||||
.dspr, .twit, .pump, .dfrn { background-color: #ffffff !important;}
|
||||
|
|
@ -18,4 +11,4 @@ div.pager, ul.tabs {
|
|||
|
||||
aside {
|
||||
border-right: 1px solid #D2D2D2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
0
view/theme/vier/font/fontawesome-webfont.eot
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.eot
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.svg
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.svg
Normal file → Executable file
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 280 KiB |
0
view/theme/vier/font/fontawesome-webfont.ttf
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.ttf
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.woff
Normal file → Executable file
0
view/theme/vier/font/fontawesome-webfont.woff
Normal file → Executable file
|
|
@ -246,10 +246,6 @@ div.pager {
|
|||
float: left;
|
||||
}
|
||||
|
||||
#contacts-actions {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#contact-edit-drop-link-end {
|
||||
/* clear: both; */
|
||||
}
|
||||
|
|
@ -539,6 +535,7 @@ nav {
|
|||
|
||||
nav .icon {
|
||||
color: #ccc;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
nav a:active,
|
||||
|
|
@ -674,8 +671,11 @@ nav #nav-help-link,
|
|||
nav #nav-search-link,
|
||||
nav #nav-directory-link,
|
||||
nav #nav-apps-link,
|
||||
nav #nav-apps-link,
|
||||
nav #nav-login-link,
|
||||
nav #nav-notifications-linkmenu,
|
||||
nav #nav-site-linkmenu,
|
||||
nav #nav-contacts-linkmenu,
|
||||
nav #nav-user-linklabel {
|
||||
float: right;
|
||||
}
|
||||
|
|
@ -688,6 +688,7 @@ nav #nav-search-link .menu-popup,
|
|||
nav #nav-directory-link .menu-popup,
|
||||
nav #nav-apps-link .menu-popup,
|
||||
nav #nav-notifications-linkmenu .menu-popup,
|
||||
nav #nav-contacts-linkmenu .menu-popup,
|
||||
nav #nav-site-linkmenu .menu-popup {
|
||||
right: 0px;
|
||||
left: auto;
|
||||
|
|
@ -710,6 +711,10 @@ nav #nav-apps-link.selected {
|
|||
border-bottom-style: none;
|
||||
}
|
||||
|
||||
nav #nav-notifications-linkmenu.on .icon-bell:before{
|
||||
content: "\f0f3";
|
||||
}
|
||||
|
||||
/* nav #nav-community-link { */
|
||||
nav ul {
|
||||
margin-left: 210px;
|
||||
|
|
@ -736,6 +741,10 @@ nav #nav-user-linkmenu {
|
|||
padding: 5px 10px; */
|
||||
}
|
||||
|
||||
#mail-update {
|
||||
top: 56px;
|
||||
}
|
||||
|
||||
.notify-seen {
|
||||
background: none repeat scroll 0 0 #DDDDDD;
|
||||
}
|
||||
|
|
@ -905,7 +914,6 @@ aside .vcard dd {
|
|||
aside #profile-photo-wrapper img {
|
||||
width: 175px;
|
||||
}
|
||||
|
||||
aside #profile-extra-links ul {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
|
|
@ -1995,7 +2003,6 @@ ul.tabs li .active, span.pager_current a {
|
|||
.comment-edit-bb a {
|
||||
color: #888;
|
||||
padding: 0px 5px 1px 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.comment-edit-bb a:hover {
|
||||
|
|
@ -2030,6 +2037,7 @@ ul.tabs li .active, span.pager_current a {
|
|||
.field .onoff {
|
||||
float: left;
|
||||
width: 80px;
|
||||
margin-right:1em;
|
||||
}
|
||||
.field .onoff a {
|
||||
display: block;
|
||||
|
|
@ -2037,24 +2045,28 @@ ul.tabs li .active, span.pager_current a {
|
|||
background-image: url("../../../images/onoff.jpg");
|
||||
background-repeat: no-repeat;
|
||||
padding: 4px 2px 2px 2px;
|
||||
font-size:14px;
|
||||
height: 16px;
|
||||
line-height:16px;
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
border-radius:4px;
|
||||
}
|
||||
.field .onoff .off {
|
||||
border-color: #666666;
|
||||
padding-left: 40px;
|
||||
border-color: #B0B0B0;
|
||||
padding-left: 36px;
|
||||
background-position: left center;
|
||||
background-color: #cccccc;
|
||||
color: #666666;
|
||||
text-align: right;
|
||||
color: #9C9C9C;
|
||||
}
|
||||
.field .onoff .on {
|
||||
border-color: #204A87;
|
||||
padding-right: 40px;
|
||||
font-weight:bold;
|
||||
border-color: #8EB8EE;
|
||||
padding-right: 36px;
|
||||
background-position: right center;
|
||||
background-color: #D7E3F1;
|
||||
color: #204A87;
|
||||
text-align: left;
|
||||
color: #36c;
|
||||
}
|
||||
.field .hidden {
|
||||
display: none!important;
|
||||
|
|
@ -2074,12 +2086,11 @@ aside form .field label {
|
|||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
|
||||
#profile-edit-links ul { margin: 0; padding:0 0 20px 0; list-style: none; }
|
||||
|
||||
#profile-edit-links li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.profile-edit-side-div {
|
||||
|
|
@ -2093,8 +2104,9 @@ aside form .field label {
|
|||
} */
|
||||
|
||||
#register-form label,
|
||||
#profile-edit-form label {
|
||||
width: 300px; float: left;
|
||||
#profile-edit-wrapper label {
|
||||
width: 200px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.required {
|
||||
|
|
@ -2731,3 +2743,91 @@ a.mail-list-link {
|
|||
.mail-conv-delete-icon {
|
||||
border: none;
|
||||
}
|
||||
|
||||
.icon.tilted-icon{
|
||||
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
|
||||
-webkit-transform: rotate(-20deg);
|
||||
-moz-transform: rotate(-20deg);
|
||||
-ms-transform: rotate(-20deg);
|
||||
-o-transform: rotate(-20deg);
|
||||
transform: rotate(-20deg);
|
||||
font-size:115%; /* 5% less than normal icons, because the tilt takes up vertical space */
|
||||
padding-top:1px;
|
||||
}
|
||||
|
||||
#profile-edit-wrapper {
|
||||
line-height: 30px;
|
||||
}
|
||||
#profile-edit-wrapper .field{
|
||||
margin-bottom:0;
|
||||
padding-bottom:0;
|
||||
}
|
||||
#profile-edit-wrapper input[type=text],
|
||||
#profile-edit-wrapper select{
|
||||
width:250px;
|
||||
}
|
||||
#profile-edit-wrapper #profile-edit-dob select{
|
||||
width:auto;
|
||||
}
|
||||
#profile-edit-wrapper,
|
||||
#profile-edit-wrapper .toggle-section-content{
|
||||
margin-bottom:15px;
|
||||
}
|
||||
.profile-edit-submit-wrapper{
|
||||
margin-top:15px;
|
||||
}
|
||||
#profile-edit-default-desc{
|
||||
display:inline-block;
|
||||
padding:15px;
|
||||
width:auto;
|
||||
border:1px solid #511919;
|
||||
}
|
||||
#profile-edit-wrapper .toggle-section-content{
|
||||
background:#ededed;
|
||||
max-width:599px;
|
||||
padding:5px;
|
||||
}
|
||||
|
||||
.btn{
|
||||
outline:none;
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
background-color:#ededed;
|
||||
-webkit-border-top-left-radius:0px;
|
||||
-moz-border-radius-topleft:0px;
|
||||
border-top-left-radius:0px;
|
||||
-webkit-border-top-right-radius:0px;
|
||||
-moz-border-radius-topright:0px;
|
||||
border-top-right-radius:0px;
|
||||
-webkit-border-bottom-right-radius:0px;
|
||||
-moz-border-radius-bottomright:0px;
|
||||
border-bottom-right-radius:0px;
|
||||
-webkit-border-bottom-left-radius:0px;
|
||||
-moz-border-radius-bottomleft:0px;
|
||||
border-bottom-left-radius:0px;
|
||||
text-indent:0;
|
||||
border:1px solid #dcdcdc;
|
||||
display:inline-block;
|
||||
color:#777777;
|
||||
font-family:Arial;
|
||||
font-size:15px;
|
||||
font-weight:bold;
|
||||
font-style:normal;
|
||||
height:40px;
|
||||
line-height:40px;
|
||||
padding:0 15px;
|
||||
text-align:center;
|
||||
text-shadow:1px 1px 0px #ffffff;
|
||||
}
|
||||
.btn:hover{
|
||||
background-color:#e6e6e6;
|
||||
text-decoration:none;
|
||||
}
|
||||
.btn:active{
|
||||
position:relative;
|
||||
top:1px;
|
||||
}
|
||||
.profile-view-actions{
|
||||
float:right;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,89 +7,80 @@
|
|||
</header>
|
||||
<nav>
|
||||
<ul>
|
||||
{{if $nav.community}}
|
||||
<li id="nav-community-link" class="nav-menu {{$sel.community}}">
|
||||
<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.network}}
|
||||
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
|
||||
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
|
||||
<span id="net-update" class="nav-notify"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $nav.home}}
|
||||
<li id="nav-home-link" class="nav-menu {{$sel.home}}">
|
||||
<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
|
||||
<span id="home-update" class="nav-notify"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $nav.messages}}
|
||||
<li id="nav-messages-linkmenu" class="nav-menu">
|
||||
<a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">{{$nav.messages.1}}
|
||||
<span id="mail-update" class="nav-notify"></span></a>
|
||||
<ul id="nav-messages-menu" class="menu-popup">
|
||||
<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
|
||||
<li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
|
||||
{{if $nav.network}}
|
||||
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
|
||||
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
|
||||
<span id="net-update" class="nav-notify"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $nav.community}}
|
||||
<li id="nav-community-link" class="nav-menu {{$sel.community}}">
|
||||
<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 icon-question"></span></a>
|
||||
<ul id="nav-site-menu" class="menu-popup">
|
||||
{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
|
||||
{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
|
||||
{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
|
||||
<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
|
||||
{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
|
||||
<!-- {{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/if}} -->
|
||||
{{if $nav.help}} <li><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
|
||||
<li><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}" >{{$nav.about.1}}</a></li>
|
||||
|
||||
{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
|
||||
{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
|
||||
</ul>
|
||||
<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
{{if $nav.notifications}}
|
||||
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
|
||||
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 icon-bell tilted-icon"></span></a>
|
||||
<span id="notify-update" class="nav-notify"></span>
|
||||
<ul id="nav-notifications-menu" class="menu-popup">
|
||||
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
|
||||
<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
<!--
|
||||
{{if $nav.help}}
|
||||
<li id="nav-help-link" class="nav-menu {{$sel.help}}">
|
||||
<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
-->
|
||||
|
||||
{{if $userinfo}}
|
||||
<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}">{{$userinfo.name}}
|
||||
<span id="intro-update" class="nav-notify"></span></a>
|
||||
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
|
||||
<ul id="nav-user-menu" class="menu-popup">
|
||||
{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
|
||||
{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
|
||||
{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a></li>{{/if}}
|
||||
{{foreach $nav.usermenu as $usermenu}}
|
||||
<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $userinfo}}
|
||||
<li id="nav-user-linklabel" class="nav-menu">
|
||||
<a href="#" rel="#nav-user-menu" title="{{$sitelocation}}">{{$userinfo.name}}<span id="intro-update" class="nav-notify"></span></a>
|
||||
</li>
|
||||
<li id="nav-user-linkmenu" class="nav-menu-icon">
|
||||
<a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
|
||||
<ul id="nav-user-menu" class="menu-popup">
|
||||
{{if $nav.introductions}}<li><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
|
||||
{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
|
||||
{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><span id="mail-update" class="nav-notify"></span></a></li>{{/if}}
|
||||
{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
|
||||
{{if $nav.usermenu.1}}<li><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
|
||||
{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
|
||||
{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.login}}
|
||||
<li id="nav-login-link" class="nav-menu">
|
||||
<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
|
||||
<li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.search}}
|
||||
<li id="search-box">
|
||||
<form method="get" action="{{$nav.search.0}}">
|
||||
<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
|
||||
</form>
|
||||
</li>
|
||||
<li id="search-box">
|
||||
<form method="get" action="{{$nav.search.0}}">
|
||||
<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
|
||||
</form>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.admin}}
|
||||
<li id="nav-admin-link" class="nav-menu">
|
||||
<!-- <a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a> -->
|
||||
<a class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ></a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.apps}}
|
||||
|
|
|
|||
3
view/theme/vier/templates/profile-hide-friends.tpl
Normal file
3
view/theme/vier/templates/profile-hide-friends.tpl
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<div id="profile-edit-hide-friends-wrapper">
|
||||
{{include file="field_yesno.tpl" field=$yesno}}
|
||||
</div>
|
||||
176
view/theme/vier/templates/profile_advanced.tpl
Normal file
176
view/theme/vier/templates/profile_advanced.tpl
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
{{if $profile.edit}}
|
||||
<div class="profile-view-actions">
|
||||
<a class="btn" href="{{$profile.edit.0}}" id="profile-view-edit-link" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<h2>{{$title}}</h2>
|
||||
|
||||
<dl id="aprofile-fullname" class="aprofile">
|
||||
<dt>{{$profile.fullname.0}}</dt>
|
||||
<dd>{{$profile.fullname.1}}</dd>
|
||||
</dl>
|
||||
|
||||
{{if $profile.gender}}
|
||||
<dl id="aprofile-gender" class="aprofile">
|
||||
<dt>{{$profile.gender.0}}</dt>
|
||||
<dd>{{$profile.gender.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.birthday}}
|
||||
<dl id="aprofile-birthday" class="aprofile">
|
||||
<dt>{{$profile.birthday.0}}</dt>
|
||||
<dd>{{$profile.birthday.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.age}}
|
||||
<dl id="aprofile-age" class="aprofile">
|
||||
<dt>{{$profile.age.0}}</dt>
|
||||
<dd>{{$profile.age.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.marital}}
|
||||
<dl id="aprofile-marital" class="aprofile">
|
||||
<dt><span class="heart">♥</span> {{$profile.marital.0}}</dt>
|
||||
<dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.sexual}}
|
||||
<dl id="aprofile-sexual" class="aprofile">
|
||||
<dt>{{$profile.sexual.0}}</dt>
|
||||
<dd>{{$profile.sexual.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.pub_keywords}}
|
||||
<dl id="aprofile-tags" class="aprofile">
|
||||
<dt>{{$profile.pub_keywords.0}}</dt>
|
||||
<dd>{{$profile.pub_keywords.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.homepage}}
|
||||
<dl id="aprofile-homepage" class="aprofile">
|
||||
<dt>{{$profile.homepage.0}}</dt>
|
||||
<dd>{{$profile.homepage.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.hometown}}
|
||||
<dl id="aprofile-hometown" class="aprofile">
|
||||
<dt>{{$profile.hometown.0}}</dt>
|
||||
<dd>{{$profile.hometown.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.politic}}
|
||||
<dl id="aprofile-politic" class="aprofile">
|
||||
<dt>{{$profile.politic.0}}</dt>
|
||||
<dd>{{$profile.politic.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.religion}}
|
||||
<dl id="aprofile-religion" class="aprofile">
|
||||
<dt>{{$profile.religion.0}}</dt>
|
||||
<dd>{{$profile.religion.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.about}}
|
||||
<dl id="aprofile-about" class="aprofile">
|
||||
<dt>{{$profile.about.0}}</dt>
|
||||
<dd>{{$profile.about.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.interest}}
|
||||
<dl id="aprofile-interest" class="aprofile">
|
||||
<dt>{{$profile.interest.0}}</dt>
|
||||
<dd>{{$profile.interest.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.likes}}
|
||||
<dl id="aprofile-likes" class="aprofile">
|
||||
<dt>{{$profile.likes.0}}</dt>
|
||||
<dd>{{$profile.likes.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.dislikes}}
|
||||
<dl id="aprofile-dislikes" class="aprofile">
|
||||
<dt>{{$profile.dislikes.0}}</dt>
|
||||
<dd>{{$profile.dislikes.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.contact}}
|
||||
<dl id="aprofile-contact" class="aprofile">
|
||||
<dt>{{$profile.contact.0}}</dt>
|
||||
<dd>{{$profile.contact.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.music}}
|
||||
<dl id="aprofile-music" class="aprofile">
|
||||
<dt>{{$profile.music.0}}</dt>
|
||||
<dd>{{$profile.music.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.book}}
|
||||
<dl id="aprofile-book" class="aprofile">
|
||||
<dt>{{$profile.book.0}}</dt>
|
||||
<dd>{{$profile.book.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.tv}}
|
||||
<dl id="aprofile-tv" class="aprofile">
|
||||
<dt>{{$profile.tv.0}}</dt>
|
||||
<dd>{{$profile.tv.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.film}}
|
||||
<dl id="aprofile-film" class="aprofile">
|
||||
<dt>{{$profile.film.0}}</dt>
|
||||
<dd>{{$profile.film.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.romance}}
|
||||
<dl id="aprofile-romance" class="aprofile">
|
||||
<dt>{{$profile.romance.0}}</dt>
|
||||
<dd>{{$profile.romance.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $profile.work}}
|
||||
<dl id="aprofile-work" class="aprofile">
|
||||
<dt>{{$profile.work.0}}</dt>
|
||||
<dd>{{$profile.work.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $profile.education}}
|
||||
<dl id="aprofile-education" class="aprofile">
|
||||
<dt>{{$profile.education.0}}</dt>
|
||||
<dd>{{$profile.education.1}}</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
|
||||
|
||||
|
||||
315
view/theme/vier/templates/profile_edit.tpl
Normal file
315
view/theme/vier/templates/profile_edit.tpl
Normal file
|
|
@ -0,0 +1,315 @@
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('.toggle-section-content').hide();
|
||||
$('.js-section-toggler').click(function(){
|
||||
$('.toggle-section-content').hide();
|
||||
$(this).next('.toggle-section-content').toggle();
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
<h1>{{$banner}}</h1>
|
||||
|
||||
<div id="profile-edit-links">
|
||||
<ul>
|
||||
<li><a class="btn" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
|
||||
{{if $multi_profiles}}
|
||||
<li><a class="btn" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
|
||||
<li><a class="btn" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
<div id="profile-edit-links-end"></div>
|
||||
|
||||
{{$default}}
|
||||
|
||||
<div id="profile-edit-wrapper" >
|
||||
|
||||
<form enctype="multipart/form-data" action="profile_photo" method="post">
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token_photo}}'>
|
||||
<input type="hidden" name="profile" value="{{$profile_name}}" />
|
||||
|
||||
<!-- Profile picture -->
|
||||
<div class="toggle-section js-toggle-section">
|
||||
<a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_picture_section}} »</a>
|
||||
<div class="js-section toggle-section-content hidden">
|
||||
|
||||
<div id="profile-photo-upload-wrapper">
|
||||
<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_profile_photo}}:</label>
|
||||
<input name="userfile" type="file" id="profile-photo-upload" size="48" />
|
||||
</div>
|
||||
|
||||
<div class="profile-edit-submit-wrapper" >
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
|
||||
</div>
|
||||
<div class="profile-edit-submit-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
|
||||
|
||||
<!-- Basic information -->
|
||||
<div class="toggle-section js-toggle-section">
|
||||
<a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_basic_section}} »</a>
|
||||
<div class="js-section toggle-section-content hidden">
|
||||
|
||||
{{if $multi_profiles}}
|
||||
<div id="profile-edit-profile-name-wrapper" >
|
||||
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
|
||||
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
|
||||
</div>
|
||||
<div id="profile-edit-profile-name-end"></div>
|
||||
{{else}}
|
||||
<input type="hidden" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" />
|
||||
{{/if}}
|
||||
|
||||
<div id="profile-edit-name-wrapper" >
|
||||
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
|
||||
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
|
||||
</div>
|
||||
<div id="profile-edit-name-end"></div>
|
||||
|
||||
<div id="profile-edit-gender-wrapper" >
|
||||
<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
|
||||
{{$gender}}
|
||||
</div>
|
||||
<div id="profile-edit-gender-end"></div>
|
||||
|
||||
<div id="profile-edit-pdesc-wrapper" >
|
||||
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
|
||||
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
|
||||
</div>
|
||||
<div id="profile-edit-pdesc-end"></div>
|
||||
|
||||
<div id="profile-edit-homepage-wrapper" >
|
||||
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
|
||||
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
|
||||
</div>
|
||||
<div id="profile-edit-homepage-end"></div>
|
||||
|
||||
<div id="profile-edit-dob-wrapper" >
|
||||
<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}}</label>
|
||||
<div id="profile-edit-dob" >
|
||||
{{$dob}} {{$age}}
|
||||
</div>
|
||||
</div>
|
||||
<div id="profile-edit-dob-end"></div>
|
||||
|
||||
{{$hide_friends}}
|
||||
|
||||
<div id="about-jot-wrapper">
|
||||
<div id="about-jot-desc">{{$lbl_about}}</div>
|
||||
<textarea rows="10" cols="72" id="profile-about-text" name="about" style="width:599px;">{{$about}}</textarea>
|
||||
</div>
|
||||
<div id="about-jot-end"></div>
|
||||
|
||||
<div id="contact-jot-wrapper" >
|
||||
<div id="contact-jot-desc">{{$lbl_social}}</div>
|
||||
<textarea rows="10" cols="72" id="contact-jot-text" name="contact" style="width:599px;">{{$contact}}</textarea>
|
||||
</div>
|
||||
<div id="contact-jot-end"></div>
|
||||
|
||||
<div id="profile-edit-pubkeywords-wrapper" >
|
||||
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
|
||||
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
|
||||
</div>
|
||||
<div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
|
||||
<div id="profile-edit-pubkeywords-end"></div>
|
||||
|
||||
<div id="profile-edit-prvkeywords-wrapper" >
|
||||
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
|
||||
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
|
||||
</div>
|
||||
<div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
|
||||
<div id="profile-edit-prvkeywords-end"></div>
|
||||
|
||||
<div class="profile-edit-submit-wrapper" >
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
|
||||
</div>
|
||||
<div class="profile-edit-submit-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- About you -->
|
||||
<div class="toggle-section js-toggle-section">
|
||||
<a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_about_section}} »</a>
|
||||
<div class="js-section toggle-section-content hidden">
|
||||
|
||||
<div><b>{{$lbl_location_section}}</b></div>
|
||||
|
||||
<div id="profile-edit-address-wrapper" >
|
||||
<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
|
||||
<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
|
||||
</div>
|
||||
<div id="profile-edit-address-end"></div>
|
||||
|
||||
<div id="profile-edit-locality-wrapper" >
|
||||
<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
|
||||
<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
|
||||
</div>
|
||||
<div id="profile-edit-locality-end"></div>
|
||||
|
||||
<div id="profile-edit-postal-code-wrapper" >
|
||||
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
|
||||
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
|
||||
</div>
|
||||
<div id="profile-edit-postal-code-end"></div>
|
||||
|
||||
<div id="profile-edit-country-name-wrapper" >
|
||||
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
|
||||
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
|
||||
<option selected="selected" >{{$country_name}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="profile-edit-country-name-end"></div>
|
||||
|
||||
<div id="profile-edit-region-wrapper" >
|
||||
<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
|
||||
<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
|
||||
<option selected="selected" >{{$region}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="profile-edit-region-end"></div>
|
||||
|
||||
<div id="profile-edit-hometown-wrapper" >
|
||||
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
|
||||
<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
|
||||
</div>
|
||||
<div id="profile-edit-hometown-end"></div>
|
||||
|
||||
<br>
|
||||
|
||||
<div><b>{{$lbl_preferences_section}}</b></div>
|
||||
|
||||
<div id="profile-edit-sexual-wrapper" >
|
||||
<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
|
||||
{{$sexual}}
|
||||
</div>
|
||||
<div id="profile-edit-sexual-end"></div>
|
||||
|
||||
<div id="profile-edit-politic-wrapper" >
|
||||
<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
|
||||
<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
|
||||
</div>
|
||||
<div id="profile-edit-politic-end"></div>
|
||||
|
||||
<div id="profile-edit-religion-wrapper" >
|
||||
<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
|
||||
<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
|
||||
</div>
|
||||
<div id="profile-edit-religion-end"></div>
|
||||
|
||||
<div id="likes-jot-wrapper">
|
||||
<div id="likes-jot-desc">{{$lbl_likes}}</div>
|
||||
<textarea rows="10" cols="72" id="likes-jot-text" name="likes" style="width:599px;">{{$likes}}</textarea>
|
||||
</div>
|
||||
<div id="likes-jot-end"></div>
|
||||
|
||||
<div id="dislikes-jot-wrapper">
|
||||
<div id="dislikes-jot-desc">{{$lbl_dislikes}}</div>
|
||||
<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" style="width:599px;">{{$dislikes}}</textarea>
|
||||
</div>
|
||||
<div id="dislikes-jot-end"></div>
|
||||
|
||||
<div class="profile-edit-submit-wrapper" >
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
|
||||
</div>
|
||||
<div class="profile-edit-submit-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Status -->
|
||||
<div class="toggle-section js-toggle-section">
|
||||
<a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_status_section}} »</a>
|
||||
<div class="js-section toggle-section-content hidden">
|
||||
|
||||
<div id="profile-edit-marital-wrapper" >
|
||||
<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
|
||||
{{$marital}}
|
||||
</div>
|
||||
<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
|
||||
<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
|
||||
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
|
||||
<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
|
||||
<div id="profile-edit-marital-end"></div>
|
||||
|
||||
<div id="romance-jot-wrapper" >
|
||||
<div id="romance-jot-desc">{{$lbl_love}}</div>
|
||||
<textarea rows="10" cols="72" id="romance-jot-text" name="romance" style="width:599px;">{{$romance}}</textarea>
|
||||
</div>
|
||||
<div id="romance-jot-end"></div>
|
||||
|
||||
<div id="work-jot-wrapper">
|
||||
<div id="work-jot-desc">{{$lbl_work}}</div>
|
||||
<textarea rows="10" cols="72" id="work-jot-text" name="work" style="width:599px;">{{$work}}</textarea>
|
||||
</div>
|
||||
<div id="work-jot-end"></div>
|
||||
|
||||
<div id="education-jot-wrapper" >
|
||||
<div id="education-jot-desc">{{$lbl_school}}</div>
|
||||
<textarea rows="10" cols="72" id="education-jot-text" name="education" style="width:599px;">{{$education}}</textarea>
|
||||
</div>
|
||||
<div id="education-jot-end"></div>
|
||||
|
||||
<div class="profile-edit-submit-wrapper" >
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
|
||||
</div>
|
||||
<div class="profile-edit-submit-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Interests -->
|
||||
<div class="toggle-section js-toggle-section">
|
||||
<a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_interests_section}} »</a>
|
||||
<div class="js-section toggle-section-content hidden">
|
||||
|
||||
<div id="interest-jot-wrapper">
|
||||
<div id="interest-jot-desc">{{$lbl_hobbies}}</div>
|
||||
<textarea rows="10" cols="72" id="interest-jot-text" name="interest" style="width:599px;">{{$interest}}</textarea>
|
||||
</div>
|
||||
<div id="interest-jot-end"></div>
|
||||
|
||||
<div id="music-jot-wrapper">
|
||||
<div id="music-jot-desc">{{$lbl_music}}</div>
|
||||
<textarea rows="10" cols="72" id="music-jot-text" name="music" style="width:599px;">{{$music}}</textarea>
|
||||
</div>
|
||||
<div id="music-jot-end"></div>
|
||||
|
||||
<div id="book-jot-wrapper">
|
||||
<div id="book-jot-desc">{{$lbl_book}}</div>
|
||||
<textarea rows="10" cols="72" id="book-jot-text" name="book" style="width:599px;">{{$book}}</textarea>
|
||||
</div>
|
||||
<div id="book-jot-end"></div>
|
||||
|
||||
<div id="tv-jot-wrapper">
|
||||
<div id="tv-jot-desc">{{$lbl_tv}}</div>
|
||||
<textarea rows="10" cols="72" id="tv-jot-text" name="tv" style="width:599px;">{{$tv}}</textarea>
|
||||
</div>
|
||||
<div id="tv-jot-end"></div>
|
||||
|
||||
<div id="film-jot-wrapper">
|
||||
<div id="film-jot-desc">{{$lbl_film}}</div>
|
||||
<textarea rows="10" cols="72" id="film-jot-text" name="film" style="width:599px;">{{$film}}</textarea>
|
||||
</div>
|
||||
<div id="film-jot-end"></div>
|
||||
|
||||
<div class="profile-edit-submit-wrapper" >
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
|
||||
</div>
|
||||
<div class="profile-edit-submit-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script>
|
||||
|
|
@ -1,22 +1,10 @@
|
|||
|
||||
<div class="vcard h-card">
|
||||
|
||||
<div class="tool">
|
||||
<div class="fn label p-name">{{$profile.name}}</div>
|
||||
{{if $profile.edit}}
|
||||
<div class="action">
|
||||
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{foreach $profile.menu.entries as $e}}
|
||||
<li>
|
||||
<a href="profiles/{{$e.id}}"><img class="u-photo" src='{{$e.photo}}'>{{$e.profile_name}}</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
|
||||
<li><a href="profiles" >{{$profile.edit.3}}</a></li>
|
||||
|
||||
</ul>
|
||||
<a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
|
||||
</div>
|
||||
{{else}}
|
||||
{{if $profile.menu}}
|
||||
|
|
@ -25,6 +13,7 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
|
||||
{{if $profile.picdate}}
|
||||
<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
|
||||
{{else}}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<?php
|
||||
/**
|
||||
* Name: Vier
|
||||
* Version: 1.1
|
||||
* Version: 1.2
|
||||
* Author: Fabio <http://kirgroup.com/profile/fabrixxm>
|
||||
* Author: Ike <http://pirati.ca/profile/heluecht>
|
||||
* Author: Beanow <https://fc.oscp.info/profile/beanow>
|
||||
* Maintainer: Ike <http://pirati.ca/profile/heluecht>
|
||||
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue