diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-01-14 10:36:45 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-01-14 10:36:45 +0100 |
| commit | 69573c6afe8afcbd75304dd0cd2f12d341f4195e (patch) | |
| tree | b029394bb034e0ae3be061812bfac513de96640e | |
| parent | e500a08f152d641f60c7146c6a290042bdd37a73 (diff) | |
| download | volse-hubzilla-69573c6afe8afcbd75304dd0cd2f12d341f4195e.tar.gz volse-hubzilla-69573c6afe8afcbd75304dd0cd2f12d341f4195e.tar.bz2 volse-hubzilla-69573c6afe8afcbd75304dd0cd2f12d341f4195e.zip | |
some template work on follow widget
| -rw-r--r-- | include/widgets.php | 4 | ||||
| -rw-r--r-- | view/css/widgets.css | 11 | ||||
| -rwxr-xr-x | view/tpl/follow.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 2 |
4 files changed, 11 insertions, 17 deletions
diff --git a/include/widgets.php b/include/widgets.php index a7d06d39e..444ce55d6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -170,8 +170,8 @@ function widget_follow($args) { } return replace_macros(get_markup_template('follow.tpl'),array( '$connect' => t('Add New Connection'), - '$desc' => t('Enter the channel address'), - '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$desc' => t('Enter channel address'), + '$hint' => t('Examples: bob@example.com, https://example.com/channel/barbara'), '$follow' => t('Connect'), '$abook_usage_message' => $abook_usage_message )); diff --git a/view/css/widgets.css b/view/css/widgets.css index f1c1436c7..a1801ac77 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -23,17 +23,6 @@ margin-top: 10px; } -/* follow */ - -#side-follow-url { - margin-top: 5px; - width: 100%; -} - -#side-follow-submit { - margin-top: 15px; -} - /* notes */ #note-text { diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 0c808b9a5..8c1f8d4ca 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -1,9 +1,14 @@ <div id="follow-sidebar" class="widget"> <h3>{{$connect}}</h3> - <div id="connect-desc">{{$desc}}</div> <form action="follow" method="post" /> - <input id="side-follow-url" type="text" name="url" title="{{$hint}}" /> - <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" /> + <div class="form-group"> + <div class="input-group"> + <input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="icon-plus"></i></button> + </div> + </div> + </div> </form> {{if $abook_usage_message}} <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 5d68cb2d8..d7d48cfd2 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -5,7 +5,7 @@ <div class="form-group"> <div class="input-group"> <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-btn"> <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button> </div> </div> |