diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 15 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/opensearch.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/settings_addons.tpl | 23 |
11 files changed, 35 insertions, 31 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 3884038c0..e2ce3c552 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -67,7 +67,6 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$verify_email}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index cf149341e..ae3e8c012 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:#c60032; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#026D0D; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/ghash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 6b59eef27..fd0ef0d9b 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -29,6 +29,21 @@ center: 'title', right: 'month,agendaWeek,agendaDay' }, + monthNames: aStr['monthNames'], + monthNamesShort: aStr['monthNamesShort'], + dayNames: aStr['dayNames'], + dayNamesShort: aStr['dayNamesShort'], + buttonText: { + prev: "<span class='fc-text-arrow'>‹</span>", + next: "<span class='fc-text-arrow'>›</span>", + prevYear: "<span class='fc-text-arrow'>«</span>", + nextYear: "<span class='fc-text-arrow'>»</span>", + today: aStr['today'], + month: aStr['month'], + week: aStr['week'], + day: aStr['day'] + }, + allDayText: aStr['allday'], timeFormat: 'H(:mm)', eventClick: function(calEvent, jsEvent, view) { showEvent(calEvent.id); diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index dc334deef..8a007232e 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -17,7 +17,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in the Red Matrix" /> + title="Search in the Hubzilla" /> <script> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 2e7e85604..38cf8edbd 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -40,6 +40,16 @@ 't15' : "{{$t15}}", 't16' : "{{$t16}}", 't17' : "{{$t17}}", + + 'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ], + 'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ], + 'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"], + 'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"], + 'today' : "{{$today}}", + 'month' : "{{$month}}", + 'week' : "{{$week}}", + 'day' : "{{$day}}", + 'allday' : "{{$allday}}" }; </script> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 4241c0a92..3d6809c22 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -189,7 +189,7 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> </li> {{/if}} </ul> diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl index ea260c6ae..8885c12bc 100755 --- a/view/tpl/opensearch.tpl +++ b/view/tpl/opensearch.tpl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Red Matrix@{{$nodename}}</ShortName> - <Description>Search in The Red Matrix@{{$nodename}}</Description> + <ShortName>Hubzilla@{{$nodename}}</ShortName> + <Description>Search in The Hubzilla@{{$nodename}}</Description> <Contact>http://github.com/friendica/red/</Contact> <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image> <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image> diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index ef8ff8dce..9df93e4c6 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -3,7 +3,7 @@ <h2>{{$mname}} {{$module}}</h2> <br /> -<a href="help/Comanche" target="redmatrix-help">{{$help}}</a> +<a href="help/Comanche" target="hubzilla-help">{{$help}}</a> <br /> <br /> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index ee0bbd86b..bf02c614d 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -9,7 +9,7 @@ <datalist id="dl-photo-upload"> {{foreach $albums as $al}} {{if $al.text}} - <option value="{{$al.text}}"> + <option value="{{$al.text}}" /> {{/if}} {{/foreach}} </datalist> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index eb497bbb5..ab62ede45 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -23,6 +23,9 @@ {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} {{include file="field_checkbox.tpl" field=$adult}} + {{include file="field_input.tpl" field=$photo_path}} + {{include file="field_input.tpl" field=$attach_path}} + <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index ae8dac3f8..52f8d9d3f 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -5,29 +5,6 @@ <form action="settings/featured" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="panel-group" id="settings" role="tablist"> - {{if $diaspora_enabled}} - <div class="panel"> - <div class="section-subtitle-wrapper" role="tab" id="dspr-settings"> - <h3> - <a title="{{$dsprdesc}}" data-toggle="collapse" data-parent="#settings" href="#dspr-settings-content" aria-controls="dspr-settings-content"> - {{$dsprtitle}} - </a> - </h3> - </div> - <div id="dspr-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="dspr-settings"> - <div class="section-content-tools-wrapper"> - - {{include file="field_checkbox.tpl" field=$dspr_allowed}} - {{include file="field_checkbox.tpl" field=$pubcomments}} - {{include file="field_checkbox.tpl" field=$hijacking}} - - <div class="settings-submit-wrapper" > - <button type="submit" name="dspr-submit" class="btn btn-primary" value="{{$dsprsubmit}}">{{$dsprsubmit}}</button> - </div> - </div> - </div> - </div> - {{/if}} {{$settings_addons}} </div> </form> |