diff options
| -rw-r--r-- | addon/README | 3 | ||||
| -rw-r--r-- | mod/network.php | 6 | ||||
| -rw-r--r-- | mod/profile.php | 7 | ||||
| -rw-r--r-- | view/en/jot.tpl | 5 | ||||
| -rw-r--r-- | view/fr/jot.tpl | 6 | ||||
| -rw-r--r-- | view/it/jot.tpl | 7 | ||||
| -rw-r--r-- | view/theme/default/style.css | 13 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 12 |
8 files changed, 54 insertions, 5 deletions
diff --git a/addon/README b/addon/README index 2e4ed6029..fb1c6340a 100644 --- a/addon/README +++ b/addon/README @@ -156,7 +156,8 @@ Current hooks: 'page_end' - called after HTML content functions have completed $b is (string) HTML of content div - +'jot_plugin' - add tools to jot toolbar + $b is (string) HTML for tool icon *** = subject to change diff --git a/mod/network.php b/mod/network.php index f9badda78..083912f86 100644 --- a/mod/network.php +++ b/mod/network.php @@ -79,6 +79,9 @@ function network_content(&$a, $update = 0) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, '$baseurl' => $a->get_baseurl(), @@ -87,7 +90,8 @@ function network_content(&$a, $update = 0) { '$lockstate' => $lockstate, '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), - '$profile_uid' => $_SESSION['uid'] + '$profile_uid' => $_SESSION['uid'], + '$jotplugins' => $jotplugins )); diff --git a/mod/profile.php b/mod/profile.php index 505edf5ce..c84b493c5 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -134,6 +134,10 @@ function profile_content(&$a, $update = 0) { $lockstate = 'lock'; else $lockstate = 'unlock'; + + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + $o .= replace_macros($tpl,array( '$baseurl' => $a->get_baseurl(), '$defloc' => (($is_owner) ? $a->user['default-location'] : ''), @@ -142,7 +146,8 @@ function profile_content(&$a, $update = 0) { '$lockstate' => $lockstate, '$bang' => '', '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), - '$profile_uid' => $a->profile['profile_uid'] + '$profile_uid' => $a->profile['profile_uid'], + '$jotplugins' => $jotplugins )); } diff --git a/view/en/jot.tpl b/view/en/jot.tpl index 6590cace8..de88fb84f 100644 --- a/view/en/jot.tpl +++ b/view/en/jot.tpl @@ -15,6 +15,11 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> +<div id="profile-jot-plugin-wrapper" > + $jotplugins +</div> +<div id="profile-jot-plugin-end"></div> + <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Share" /> <div id="profile-upload-wrapper" style="display: $visitor;" > diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl index 6590cace8..9a5c58153 100644 --- a/view/fr/jot.tpl +++ b/view/fr/jot.tpl @@ -15,6 +15,12 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> +<div id="profile-jot-plugin-wrapper" > + $jotplugins +</div> +<div id="profile-jot-plugin-end"></div> + + <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Share" /> <div id="profile-upload-wrapper" style="display: $visitor;" > diff --git a/view/it/jot.tpl b/view/it/jot.tpl index 5aaf9b923..b0c90ddf5 100644 --- a/view/it/jot.tpl +++ b/view/it/jot.tpl @@ -15,6 +15,11 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> +<div id="profile-jot-plugin-wrapper" > + $jotplugins +</div> +<div id="profile-jot-plugin-end"></div> + <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Condividi" /> <div id="profile-upload-wrapper" style="display: $visitor;" > @@ -40,6 +45,8 @@ <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div> </div> + + <div id="profile-jot-end"></div> </form> </div> diff --git a/view/theme/default/style.css b/view/theme/default/style.css index fcc9c94a8..6e643d4fe 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -1034,7 +1034,7 @@ input#dfrn-url { margin-left: 110px; margin-top: 10px; } - +#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { margin-top: 15px; } @@ -1078,7 +1078,9 @@ input#dfrn-url { #profile-jot-perms-end { clear: both; } - +#profile-jot-plugin-end { + clear:both; +} #profile-jot-end { clear: both; margin-bottom: 30px; @@ -2000,3 +2002,10 @@ a.mail-list-link { margin-bottom: 15px; } +.tool-wrapper { + float: left; + margin-left: 5px; +} +.tool-link { + cursor: pointer; +} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1a415db45..76a37e7c4 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -907,6 +907,7 @@ input#dfrn-url { margin: 10px 0px 10px 110px; } +#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { margin-top: 15px; } @@ -952,6 +953,9 @@ input#dfrn-url { height: 30px; } +#profile-jot-plugin-end{ + clear: both; +} #profile-jot-end { /*clear: both;*/ margin-bottom: 30px; @@ -1885,3 +1889,11 @@ a.mail-list-link { margin-bottom: 15px; } + +.tool-wrapper { + float: left; + margin-left: 5px; +} +.tool-link { + cursor: pointer; +} |