diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /view/tpl | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/diaspora_consensus.tpl | 17 | ||||
| -rw-r--r-- | view/tpl/diaspora_post.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/opensearch.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/usermenu.tpl | 13 |
10 files changed, 42 insertions, 9 deletions
diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl new file mode 100644 index 000000000..b6b7cf13d --- /dev/null +++ b/view/tpl/diaspora_consensus.tpl @@ -0,0 +1,17 @@ +<poll> +<guid>{{$guid_q}}</guid> +<question>{{$question}}</question> +<poll_answer> + <guid>{{$guid_y}}</guid> + <answer>{{$agree}}</answer> +</poll_answer> +<poll_answer> + <guid>{{$guid_n}}</guid> + <answer>{{$disagree}}</answer> +</poll_answer> +<poll_answer> + <guid>{{$guid_a}}</guid> + <answer>{{$abstain}}</answer> +</poll_answer> +</poll> + diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl index 2fe916e00..ebfe9e5b7 100644 --- a/view/tpl/diaspora_post.tpl +++ b/view/tpl/diaspora_post.tpl @@ -4,6 +4,7 @@ <raw_message>{{$body}}</raw_message> <guid>{{$guid}}</guid> <diaspora_handle>{{$handle}}</diaspora_handle> + {{$poll}} <public>{{$public}}</public> <created_at>{{$created}}</created_at> <provider_display_name>{{$provider}}</provider_display_name> 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/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/menuedit.tpl b/view/tpl/menuedit.tpl index b3704e86e..da3172434 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -19,6 +19,7 @@ {{/if}} {{include file="field_input.tpl" field=$menu_name}} {{include file="field_input.tpl" field=$menu_desc}} + {{include file="field_checkbox.tpl" field=$menu_bookmark}} <div class="menuedit-submit-wrapper form-group pull-right" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 3200766ca..8b8afa24c 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -11,6 +11,13 @@ {{/if}} {{include file="field_input.tpl" field=$mitem_desc}} {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} {{include file="field_input.tpl" field=$mitem_order}} {{include file="field_checkbox.tpl" field=$usezid}} {{include file="field_checkbox.tpl" field=$newwin}} 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/usermenu.tpl b/view/tpl/usermenu.tpl index 57caf25fc..4ecf823dd 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -1,13 +1,20 @@ +{{if $wrap}} <div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}"> +{{/if}} {{if $menu.menu_desc}} <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> {{/if}} - {{if $items }} - <ul class="pmenu-body{{if !$class}} nav nav-pills nav-stacked{{/if}}"> + {{if $items}} + <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}"> {{foreach $items as $mitem }} - <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> + <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> + <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}"{{if $mitem.submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> + {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} + </li> {{/foreach }} </ul> {{/if}} +{{if $wrap}} <div class="pmenu-end"></div> </div> +{{/if}} |