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

clean up w3c validation and layout for priv mail and lang selector

This commit is contained in:
Friendika 2011-10-05 15:35:53 -07:00
parent 09fcfe2fe7
commit b1e5dfad3c
8 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/text.php
View File

@ -865,7 +865,7 @@ function lang_selector() {
global $lang; global $lang;
$o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>'; $o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
$o .= '<div id="language-selector" style="display: none;" >'; $o .= '<div id="language-selector" style="display: none;" >';
$o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >'; $o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >';
$langs = glob('view/*/strings.php'); $langs = glob('view/*/strings.php');
if(is_array($langs) && count($langs)) { if(is_array($langs) && count($langs)) {
$langs[] = ''; $langs[] = '';
@ -880,7 +880,7 @@ function lang_selector() {
} }
$ll = substr($l,5); $ll = substr($l,5);
$ll = substr($ll,0,strrpos($ll,'/')); $ll = substr($ll,0,strrpos($ll,'/'));
$selected = (($ll === $lang) ? ' selected="selected" ' : ''); $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : '');
$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>'; $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
} }
} }

7
mod/dfrn_notify.php
View File

@ -451,9 +451,12 @@ function dfrn_notify_post(&$a) {
if($is_reply) { if($is_reply) {
// was the top-level post for this reply written by somebody on this site? Specifically, the recipient? // was the top-level post for this reply written by somebody on this site?
// Specifically, the recipient?
$r = q("select `item`.`id` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` where `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1", $r = q("select `item`.`id` from `item`
LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
dbesc($parent_uri), dbesc($parent_uri),
intval($importer['importer_uid']) intval($importer['importer_uid'])
); );

2
mod/item.php
View File

@ -703,7 +703,7 @@ function item_post(&$a) {
else else
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr; $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha')); $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
intval($post_id), intval($post_id),

3
view/mail_head.tpl
View File

@ -5,5 +5,6 @@
<li><a href="message" class="button message-link-inbox">$inbox</a></li> <li><a href="message" class="button message-link-inbox">$inbox</a></li>
<li><a href="message/sent" class="button message-link-outbox">$outbox</a></li> <li><a href="message/sent" class="button message-link-outbox">$outbox</a></li>
<li><a href="message/new" class="button message-link-new">$new</a></li> <li><a href="message/new" class="button message-link-new">$new</a></li>
<ul> </ul>
</div> </div>
<div class="message-links-end"></div>

2
view/mail_list.tpl
View File

@ -7,7 +7,7 @@
<div class="mail-list-date">$date</div> <div class="mail-list-date">$date</div>
<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div> <div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" > <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
<a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list- delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div> </div>
</div> </div>
</div> </div>

3
view/prv_message.tpl
View File

@ -19,7 +19,7 @@ $select
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="Submit" /> <input type="submit" id="prvmail-submit" name="submit" value="Submit" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload"class="icon border camera" title="$upload" /></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
@ -29,6 +29,5 @@ $select
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>
</div>
</form> </form>
</div> </div>

2
view/theme/duepuntozero/nav.tpl
View File

@ -35,7 +35,7 @@
<span id="intro-update" class="nav-ajax-left"></span> <span id="intro-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
{{ if $nav.messages }} {{ if $nav.messages }}
<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0 $sel.messages" title="$nav.messages.3" >$nav.messages.1</a> <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span> <span id="mail-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}

5
view/theme/duepuntozero/style.css
View File

@ -1805,6 +1805,9 @@ a.mail-list-link {
margin-right: 30px; margin-right: 30px;
margin-top: 15px; margin-top: 15px;
} }
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon { .mail-conv-delete-icon {
border: none; border: none;
@ -1823,7 +1826,7 @@ a.mail-list-link {
padding: 3px 5px; padding: 3px 5px;
} }
.message-links ul ul { .message-links-end {
clear: both; clear: both;
} }