harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
marijus
2014-05-09 07:39:27 +02:00
parent 6e397240a3 831b18cf28
commit 56eb9e75cc
13 changed files with 6010 additions and 5924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/css/conversation.css
View File

@@ -57,7 +57,7 @@
/* conversation */
.thread-wrapper.toplevel_item {
margin-bottom: 10px;
margin-bottom: 20px;
}
/* conv_item */

3
view/css/mod_events.css Normal file
View File

@@ -0,0 +1,3 @@
#event-desc-textarea, #event-location-textarea {
width: 400px;
}

9514
view/it/messages.po
View File

File diff suppressed because it is too large Load Diff

2315
view/it/strings.php
View File

File diff suppressed because it is too large Load Diff

13
view/theme/redbasic/css/style.css
View File

@@ -1911,18 +1911,24 @@ img.mail-list-sender-photo {
.wall-item-content-wrapper:hover {
z-index:99;
}
/*
.comment .wall-item-body {
padding-left: 42px;
}
*/
.hide-comments-outer,
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
border-left: 3px solid $comment_border_colour;
border-left: 1px solid $comment_border_colour;
border-right: 1px solid $comment_border_colour;
border-bottom: 1px solid $comment_border_colour;
border-radius: 0px;
padding: 7px 10px 7px 7px;
}
.wall-item-comment-wrapper {
background-color: $comment_item_colour;
border-left: 3px solid $item_colour;
border: 1px solid $item_colour;
border-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
@@ -2329,6 +2335,7 @@ blockquote {
.thread-wrapper.toplevel_item {
width: 100%;
border:1px;
}
.wall-item-photo {

11
view/tpl/event_form.tpl
View File

@@ -13,14 +13,18 @@
<div id="event-start-text">{{$s_text}}</div>
{{$s_dsel}} {{$s_tsel}}
<div class="clear"></div><br />
<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
<div id="event-nofinish-break"></div>
<div id="event-finish-text">{{$f_text}}</div>
{{$f_dsel}} {{$f_tsel}}
<div id="event-datetime-break"></div>
<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
<div id="event-nofinish-break"></div>
<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
@@ -36,6 +40,7 @@
<div id="event-location-text">{{$l_text}}</div>
<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
<br />
<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
<div id="event-share-break"></div>

5
view/tpl/event_head.tpl
View File

@@ -73,7 +73,7 @@
});
</script>
{{if $editselect != 'none'}}
<script language="javascript" type="text/javascript"
src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
@@ -81,7 +81,7 @@
tinyMCE.init({
theme : "advanced",
mode : "textareas",
mode : "{{$editselect}}",
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
@@ -107,6 +107,7 @@
});
{{/if}}
$(document).ready(function() {