clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* 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');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1270' );
define ( 'FRIENDICA_VERSION', '2.3.1271' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
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, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
node2bbcode($doc, 'code', array(), '[code]', '[/code]');
$message = $doc->saveHTML();

15
view/theme/diabook/jot.tpl
View File

@ -45,23 +45,25 @@
</div>
<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;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div>
<div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper">
$jotplugins
</div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
</div>
<div id="profile-jot-perms-end"></div>
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">
@ -75,9 +77,8 @@
</div>
</div>
<div id="profile-jot-end"></div>
</form>
</div>
{{ if $content }}<script>initEditor();</script>{{ endif }}

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

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

3
view/theme/diabook/wallwall_item.tpl
View File

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