Merge develop into 1404_reworked_autocomplete
Conflicts: include/text.php view/templates/head.tpl view/theme/duepuntozero/style.css view/theme/vier/style.css
This commit is contained in:
rabuzarus
commit
01b02dbcaa
723 changed files with 40077 additions and 44824 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html >
|
||||
<html>
|
||||
<html lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
|
||||
|
|
@ -28,7 +28,9 @@
|
|||
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
|
||||
<div class='main-content-container'>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
|
|
@ -39,4 +41,3 @@
|
|||
<?php if(x($page,'end')) echo $page['end']; ?>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -113,6 +113,51 @@ blockquote {
|
|||
|
||||
.pull-right { float: right }
|
||||
|
||||
.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;
|
||||
text-indent: 0;
|
||||
border: 1px solid #dcdcdc;
|
||||
display: inline-block;
|
||||
color: #777777;
|
||||
padding: 5px 10px;
|
||||
text-align: center;
|
||||
border-radius: 8px;
|
||||
}
|
||||
a.btn {
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.menu-popup {
|
||||
width: auto;
|
||||
border: 2px solid #444444;
|
||||
background: #FFFFFF;
|
||||
position: absolute;
|
||||
margin: 2px 0 0;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
.menu-popup li a {
|
||||
display: block;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
.menu-popup li a:hover {
|
||||
color: #FFFFFF;
|
||||
background: #3465A4;
|
||||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup li.divider {
|
||||
height: 1px;
|
||||
margin: 3px 0;
|
||||
overflow: hidden;
|
||||
background-color: #2d2d2d;
|
||||
}
|
||||
|
||||
|
||||
/* nav */
|
||||
|
|
@ -1952,6 +1997,20 @@ input#dfrn-url {
|
|||
margin-left: 15px;
|
||||
}
|
||||
|
||||
#contact-edit-status-wrapper {
|
||||
padding: 10px;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
#contact-edit-contact-status {
|
||||
font-weight: bold;
|
||||
}
|
||||
#contact-edit-actions {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#contact-edit-wrapper {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -1989,11 +2048,6 @@ input#dfrn-url {
|
|||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#contact-edit-drop-link {
|
||||
float: right;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
#contact-edit-nav-end {
|
||||
clear: both;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,50 +6,51 @@
|
|||
|
||||
{{$tab_str}}
|
||||
|
||||
<div id="contact-edit-drop-link" >
|
||||
<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
|
||||
</div>
|
||||
|
||||
<div id="contact-edit-drop-link-end"></div>
|
||||
|
||||
|
||||
<div id="contact-edit-nav-wrapper" >
|
||||
<div id="contact-edit-links">
|
||||
<ul>
|
||||
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
|
||||
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
|
||||
{{if $lost_contact}}
|
||||
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
|
||||
{{/if}}
|
||||
{{if $insecure}}
|
||||
<li><div id="insecure-message">{{$insecure}}</div></li>
|
||||
{{/if}}
|
||||
{{if $blocked}}
|
||||
<li><div id="block-message">{{$blocked}}</div></li>
|
||||
{{/if}}
|
||||
{{if $ignored}}
|
||||
<li><div id="ignore-message">{{$ignored}}</div></li>
|
||||
{{/if}}
|
||||
{{if $archived}}
|
||||
<li><div id="archive-message">{{$archived}}</div></li>
|
||||
{{/if}}
|
||||
<div id="contact-edit-status-wrapper">
|
||||
<span id="contact-edit-contact-status">{{$contact_status}}</span>
|
||||
|
||||
<li> </li>
|
||||
<div id="contact-edit-actions">
|
||||
<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
|
||||
|
||||
{{if $common_text}}
|
||||
<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
|
||||
{{/if}}
|
||||
{{if $all_friends}}
|
||||
<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
|
||||
{{/if}}
|
||||
<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" >
|
||||
{{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
|
||||
{{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
|
||||
<li class="divider"></li>
|
||||
<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
|
||||
<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
|
||||
<li role="menuitem"><a href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
|
||||
<li role="menuitem"><a href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<ul>
|
||||
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
|
||||
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
|
||||
{{if $poll_enabled}}
|
||||
<div id="contact-edit-poll-wrapper">
|
||||
<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{if $lost_contact}}
|
||||
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
|
||||
{{/if}}
|
||||
{{if $insecure}}
|
||||
<li><div id="insecure-message">{{$insecure}}</div></li>
|
||||
{{/if}}
|
||||
{{if $blocked}}
|
||||
<li><div id="block-message">{{$blocked}}</div></li>
|
||||
{{/if}}
|
||||
{{if $ignored}}
|
||||
<li><div id="ignore-message">{{$ignored}}</div></li>
|
||||
{{/if}}
|
||||
{{if $archived}}
|
||||
<li><div id="archive-message">{{$archived}}</div></li>
|
||||
{{/if}}
|
||||
|
||||
<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
|
||||
{{if $lblsuggest}}
|
||||
<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
|
||||
{{/if}}
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="contact-edit-nav-end"></div>
|
||||
|
|
@ -58,12 +59,6 @@
|
|||
<form action="contacts/{{$contact_id}}" method="post" >
|
||||
<input type="hidden" name="contact_id" value="{{$contact_id}}">
|
||||
|
||||
{{if $poll_enabled}}
|
||||
<div id="contact-edit-poll-wrapper">
|
||||
<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
||||
<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
|
||||
</div>
|
||||
{{/if}}
|
||||
<div id="contact-edit-end" ></div>
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$hidden}}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
*/
|
||||
|
||||
function frost_init(&$a) {
|
||||
$a->theme_info = array();
|
||||
$a->videowidth = 400;
|
||||
$a->videoheight = 330;
|
||||
$a->theme_thread_allow = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue