friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

This commit is contained in:
Domovoy 2012-08-19 14:14:33 +02:00
parent b558dbbdb2 6bc48b58d8
commit 1406480258
12 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1438' );
define ( 'FRIENDICA_VERSION', '3.0.1439' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1154 );
@ -904,6 +904,10 @@ if(! function_exists('login')) {
$tpl = get_markup_template("logout.tpl");
}
else {
$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
'$baseurl' => $a->get_baseurl(true)
));
$tpl = get_markup_template("login.tpl");
$_SESSION['return_url'] = $a->query_string;
}

2
database.sql
View File

@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
-- Table structure for table `locks`
--
CREATE TABLE `locks` (
CREATE TABLE IF NOT EXISTS `locks` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` char(128) NOT NULL,
`locked` tinyint(1) NOT NULL DEFAULT '0',

1
include/bbcode.php
View File

@ -325,6 +325,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
// Try to Oembed

4
mod/install.php
View File

@ -60,7 +60,7 @@ function install_post(&$a) {
return;
break;
case 4;
case 4:
$urlpath = $a->get_path();
$dbhost = notags(trim($_POST['dbhost']));
$dbuser = notags(trim($_POST['dbuser']));
@ -155,11 +155,11 @@ function install_content(&$a) {
}
if(x($a->data,'txt') && strlen($a->data['txt'])) {
$tpl = get_markup_template('install.tpl');
$db_return_text .= manual_config($a);
}
if ($db_return_text!="") {
$tpl = get_markup_template('install.tpl');
return replace_macros($tpl, array(
'$title' => $install_title,
'$pass' => "",

4
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1438\n"
"Project-Id-Version: 3.0.1439\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-08-17 10:00-0700\n"
"POT-Creation-Date: 2012-08-18 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

0
view/login_head.tpl Normal file
View File

5
view/theme/frost-mobile/login-style.css
View File

@ -26,7 +26,7 @@ img.login-button-image {
max-width: 300px;
}
.section-wrapper {
div.section-wrapper {
position: relative;
width: 300px;
margin-left: auto;
@ -45,6 +45,8 @@ img.login-button-image {
.field label {
margin-left: 25px;
font-weight: 700;
float: none;
width: auto;
}
.field input {
@ -62,6 +64,7 @@ img.login-button-image {
background-position: 0 50%;
width: 182px;
padding-left: 18px;
margin-left: 50px;
}
#login-footer {

2
view/theme/frost-mobile/login_head.tpl Normal file
View File

@ -0,0 +1,2 @@
<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />

6
view/theme/frost-mobile/style.css
View File

@ -547,7 +547,7 @@ footer {
margin-top: 10px;
}
/*
#login_standard {
width: 210px;
float: left;
@ -577,9 +577,9 @@ footer {
}
#login-submit-button {
/* margin-top: 10px; */
margin-top: 10px;
margin-left: 200px;
}
}*/
input#dfrn-url {

15
view/theme/frost/login-style.css
View File

@ -1,6 +1,7 @@
body {
font-family: helvetica,arial,freesans,clean,sans-serif;
font-size: 14px;
/*background-image: none;*/
background-color: #ffffff;
color: #505050;/* ZP Change*/
margin: 0px;
@ -19,7 +20,7 @@ img.login-button-image {
max-width: 350px;
}
.section-wrapper {
div.section-wrapper {
position: relative;
width: 800px;
margin-left: auto;
@ -28,7 +29,8 @@ img.login-button-image {
}
.login-form {
margin-top: 200px;
padding-top: 200px;
margin-bottom: 50px;
}
.register-form {
@ -39,7 +41,13 @@ img.login-button-image {
margin-top: 170px;
}
.field {
margin-bottom: 2px;
padding-bottom: 0px;
}
.field label {
width: auto;
position: absolute;
margin-left: 0px;
font-weight: 700;
@ -50,7 +58,8 @@ img.login-button-image {
width: 200px;
}
.openid input {
/*.openid input {*/
#id_openid_url, .openid input {
background: url(login-bg.gif) no-repeat;
background-position: 0 50%;
width: 182px;

2
view/theme/frost/login_head.tpl Normal file
View File

@ -0,0 +1,2 @@
<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />

10
view/theme/frost/style.css
View File

@ -511,8 +511,10 @@ div.wall-item-content-wrapper.shiny {
margin-top: 10px;
}
#login_standard {
.login-form {
margin-top: -150px;
}
/*#login_standard {
width: 210px;
float: left;
}
@ -541,9 +543,9 @@ div.wall-item-content-wrapper.shiny {
}
#login-submit-button {
/* margin-top: 10px; */
margin-top: 10px;
margin-left: 200px;
}
}*/
input#dfrn-url {