mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:
This commit is contained in:
Simon L'nu 2012-03-04 22:15:28 -05:00
parent efb60e603c d369fcc994
commit b34dd1ca71
5 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1270' ); define ( 'FRIENDICA_VERSION', '2.3.1271' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 ); define ( 'DB_UPDATE_VERSION', 1131 );

2
include/html2bbcode.php
View file

@ -212,7 +212,7 @@ function html2bbcode($message)
node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
node2bbcode($doc, 'code', array(), '[code]$1', '[/code]'); node2bbcode($doc, 'code', array(), '[code]', '[/code]');
$message = $doc->saveHTML(); $message = $doc->saveHTML();

9
view/theme/diabook/jot.tpl
View file

@ -46,12 +46,11 @@
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" /> <input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
<button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button> <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div> </div>
<div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper"> <div id="profile-jot-plugin-wrapper">
@ -62,6 +61,9 @@
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div>
<div id="profile-jot-perms-end"></div>
<div id="jot-preview-content" style="display:none;"></div> <div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;"> <div style="display: none;">
@ -75,9 +77,8 @@
</div> </div>
</div>
<div id="profile-jot-end"></div>
</form> </form>
</div> </div>
{{ if $content }}<script>initEditor();</script>{{ endif }} {{ if $content }}<script>initEditor();</script>{{ endif }}

29
view/theme/diabook/style.css
View file

@ -384,9 +384,7 @@ body {
font-size: 13px; font-size: 13px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin-left: : auto; margin: 50px auto auto;
margin-right: auto;
margin-top: 50px;
display: table; display: table;
} }
h4 { h4 {
@ -1005,24 +1003,24 @@ section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 800px; width: 800px;
padding: 0px 0px 0px 10px; padding: 0px 0px 0px 12px;
} }
.tabs { .tabs {
background-position: 0 -20px; background-position: 0 -20px;
background-repeat: repeat-x; background-repeat: repeat-x;
height: 27px; height: 27px;
padding: 0; padding: 0;
} }
.tab.button { .tab.button {
margin-right: 15px; margin-right: 5px;
margin-left: 15px; margin-left: 5px;
background: none repeat scroll 0 0 #F8F8F8; /*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
font-weight: bold; font-weight: normal;
padding: 3px; padding: 3px;
color: #333333;
} }
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
@ -1045,6 +1043,8 @@ section {
display: table; display: table;
width: 780px; width: 780px;
} }
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row; display: table-row;
} }
@ -1221,8 +1221,12 @@ section {
border-right: 1px solid #A7C7F7; border-right: 1px solid #A7C7F7;
padding-right: 12px; padding-right: 12px;
} }
#jot-preview-content{
margin-top: 30px;}
#jot-preview-content .tread-wrapper { #jot-preview-content .tread-wrapper {
background-color: #fce94f; background-color: #fff797;
} }
.wall-item-tags { .wall-item-tags {
@ -1667,11 +1671,10 @@ ul.tabs {
} }
ul.tabs li { ul.tabs li {
float: left; float: left;
margin-left: 7px; margin-left: 5px;
} }
ul.tabs li .active { ul.tabs li .active {
background-color: #33ACFF; background-color: #333333;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777; border: 1px solid #777777;
color: white; color: white;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;

1
view/theme/diabook/wallwall_item.tpl
View file

@ -104,4 +104,3 @@
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >
$item.comment $item.comment
</div> </div>
tb