Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-07-29 15:36:01 -07:00
parent 299f9e3d9e ee802016ba
commit 9b752b8a59
8 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/conversation.php
View file

@ -1163,6 +1163,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
'$mobileapp' => t('Friendica mobile web'),
));

1
mod/editpost.php
View file

@ -132,6 +132,7 @@ function editpost_content(&$a) {
'$profile_uid' => $_SESSION['uid'],
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$mobileapp' => t('Friendica mobile web'),
));
return $o;

1
view/theme/frost-mobile/jot.tpl
View file

@ -13,6 +13,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="source" value="$mobileapp" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>

6
view/theme/frost-mobile/nav.tpl
View file

@ -13,6 +13,11 @@
<img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png">
<!-- </a>-->
<ul id="system-menu-list" class="nav-menu-list">
{{ if $nav.manage }}
<li>
<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
</li>
{{ endif }}
{{ if $nav.settings }}
<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
{{ endif }}
@ -120,7 +125,6 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>

2
view/theme/frost-mobile/style.css
View file

@ -360,7 +360,7 @@ section {
}
.tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
.tabs a {
padding: 0.2em 2em;
padding: 0.4em 2em;
border: 1px solid #aaa;
border-radius: 8px;
-moz-border-radius: 8px;

18
view/theme/frost/field_combobox.tpl Normal file
View file

@ -0,0 +1,18 @@
<div class='field combobox'>
<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
{# html5 don't work on Chrome, Safari and IE9
<input id="id_$field.0" type="text" list="data_$field.0" >
<datalist id="data_$field.0" >
{{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
</datalist> #}
<input id="id_$field.0" type="text" value="$field.2">
<select id="select_$field.0" onChange="$j('#id_$field.0').val($j(this).val())">
<option value="">$field.5</option>
{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
</select>
<span class='field_help'>$field.3</span>
</div>

7
view/theme/frost/nav.tpl
View file

@ -13,6 +13,12 @@
<img class="system-menu-link" src="/view/theme/frost/images/menu.png">
</a>
<ul id="system-menu-list" class="nav-menu-list">
{{ if $nav.manage }}
<li>
<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
</li>
{{ endif }}
{{ if $nav.settings }}
<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
{{ endif }}
@ -120,7 +126,6 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>

2
view/theme/frost/style.css
View file

@ -2222,7 +2222,7 @@ aside input[type='text'] {
.widget {
border: 1px solid #DDDDDD;
padding: 8px;
padding: 1em 2em;
margin-top: 5px;
-moz-border-radius:5px;
-webkit-border-radius:5px;