From d1efb59fcdd3d5e78f3071c7a7a959c285782931 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 30 May 2016 16:12:48 +0200 Subject: render code bbcode inline if there are no linebreaks in the text. --- view/css/conversation.css | 20 ++++++++++++-------- view/theme/redbasic/css/style.css | 5 ++--- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 9b99efba4..328f9df02 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,11 +1,3 @@ -/* common */ - -code { - font-family: Courier, monospace; - display: block; - overflow: auto; -} - /* jot */ .jothidden input { @@ -305,6 +297,18 @@ a.wall-item-name-link { /* bb-code */ +code { + font-family: Courier, monospace; + font-size: 1em; + padding: 1em 1.5em; + display: block; +} + +code.inline-code { + padding: 0px 4px; + display: inline; +} + .overline { text-decoration: overline; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1c2e8cdb2..ae2826516 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -113,13 +113,12 @@ pre code { } code { - font-size: 1em; - padding: 1em 1.5em; - border: 1px solid #ccc; background: #ccc; color: #000; } + + pre { background: #F5F5F5; color: #333; -- cgit v1.2.3 From dfb6255f59980835d364402b372dd39f2b41ee7c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 31 May 2016 17:50:47 -0700 Subject: more removal of reserved words from DB schemas --- view/tpl/settings_oauth.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 02ca26234..9582ef52d 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -18,7 +18,7 @@ {{foreach $apps as $app}}
- {{if $app.name}}

{{$app.name}}

{{else}}

{{$noname}}

{{/if}} + {{if $app.clname}}

{{$app.clname}}

{{else}}

{{$noname}}

{{/if}} {{if $app.my}} {{if $app.oauth_token}}
-- cgit v1.2.3 From b1259876bf398880e7b0c1b44d90f94983243e72 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 31 May 2016 21:45:33 -0700 Subject: more db column renames --- view/tpl/profile_advanced.tpl | 18 +++++++++++++----- view/tpl/profile_edit.tpl | 6 +++--- view/tpl/profile_vcard.tpl | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index c617e6c14..a4c98b1d0 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -33,6 +33,7 @@
{{foreach $fields as $f}} + {{if $f == 'name'}}
{{$profile.fullname.0}}
@@ -40,6 +41,13 @@
{{/if}} + {{if $f == 'fullname'}} +
+
{{$profile.fullname.0}}
+
{{$profile.fullname.1}}
+
+ {{/if}} + {{if $f == 'gender'}} {{if $profile.gender}}
@@ -72,7 +80,7 @@ {{if $profile.marital}}
 {{$profile.marital.0}}
-
{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}
+
{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}
{{/if}} {{/if}} @@ -237,11 +245,11 @@ {{/if}} - {{if $f == 'work'}} - {{if $profile.work}} + {{if $f == 'employment'}} + {{if $profile.employment}}
-
{{$profile.work.0}}
-
{{$profile.work.1}}
+
{{$profile.employment.0}}
+
{{$profile.employment.1}}
{{/if}} {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index deabc2795..b0211d697 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -173,7 +173,7 @@
- {{if $fields.with}} + {{if $fields.partner}} {{include file="field_input.tpl" field=$with}} {{/if}} @@ -198,7 +198,7 @@
{{/if}} - {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.romance || $fields.education || $extra_fields}} + {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}}