diff options
| -rw-r--r-- | addon/impressum/impressum.php | 2 | ||||
| -rw-r--r-- | addon/piwik/piwik.php | 2 | ||||
| -rw-r--r-- | addon/statusnet/statusnet.php | 6 | ||||
| -rw-r--r-- | addon/twitter/twitter.php | 2 | ||||
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 5 | ||||
| -rw-r--r-- | view/theme/dispy/jot.tpl | 22 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 121 |
7 files changed, 123 insertions, 37 deletions
diff --git a/addon/impressum/impressum.php b/addon/impressum/impressum.php index b93d9eef6..b760c7e0d 100644 --- a/addon/impressum/impressum.php +++ b/addon/impressum/impressum.php @@ -4,7 +4,7 @@ * Description: Plugin to add contact information to the about page (/friendika) * Version: 1.0 * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> - * License: 3-clause BSD license (same as Friendika) + * License: 3-clause BSD license */ function impressum_install() { diff --git a/addon/piwik/piwik.php b/addon/piwik/piwik.php index 3cc136d29..8389416e9 100644 --- a/addon/piwik/piwik.php +++ b/addon/piwik/piwik.php @@ -12,7 +12,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License: 3-clause BSD license (same as Friendika) +* License: 3-clause BSD license * * Configuration: * Add the following two lines to your .htconfig.php file: diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 63cdd28df..062884b96 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -10,7 +10,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To activate the plugin itself add it to the $a->config['system']['addon'] @@ -155,8 +155,8 @@ function statusnet_settings_post ($a,$post) { goaway($a->get_baseurl().'/settings/addon'); } else { if (isset($_POST['statusnet-pin'])) { - // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen - logger('got a StatusNet security code'); + // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen + logger('got a StatusNet security code'); $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 7f2b2e1c7..26b324aca 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -11,7 +11,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To use this plugin you need a OAuth Consumer key pair (key & secret) diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index eb88f00c1..5d4babb9d 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -70,6 +70,11 @@ tinyMCE.init({ <script> var ispublic = '$ispublic'; $(document).ready(function() { + $("#profile-jot-acl-wrapper").hide(); + $("a#jot-perms-icon").fancybox({ + 'transitionIn' : 'none', + 'transitionOut' : 'none' + }); var uploader = new window.AjaxUpload( 'wall-image-upload', { action: 'wall_upload/$nickname', diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index f87b6fbb3..b357bd38b 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -21,7 +21,8 @@ <div id="profile-jot-submit-wrapper" > - <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><a id="jot-perms-icon" class="icon $lockstate" title="$permset" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');return false;"></a>$bang</div> + <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" > + <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang</div> <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> </div> @@ -59,16 +60,15 @@ <div id="profile-jot-tools-end"></div> - <div id="profile-jot-email-wrapper" style="display: none;" > - <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle"> - <div id="profile-jot-email-end"></div> - </div> - <div id="profile-jot-networks" style="display: none;" > - $jotnets - </div> - <div id="profile-jot-networks-end"></div> - <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div> - + <div style="display: none;"> + <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> + $acl + <hr style="clear:both"/> + <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> + <div id="profile-jot-email-end"></div> + $jotnets + </div> + </div> <div id="profile-jot-end"></div> </form> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index c04a67ec9..8526b35a6 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -321,9 +321,10 @@ aside #viewcontacts { text-align: right;} padding: 5px; } #profile-jot-acl-wrapper { - margin: 0px 10%; + margin: 0px 10px; border: 1px solid #555753; border-top: 0px; + display:block!important; } #group_allow_wrapper, #group_deny_wrapper, @@ -342,25 +343,6 @@ aside #viewcontacts { text-align: right;} - -#acl-permit-wrapper, -#acl-deny-wrapper { padding: 5px; } - -#acl-allow-group-label, -#acl-allow-contact-label, -#acl-deny-group-label, -#acl-deny-contact-label { display: block } - -#group_allow, #contact_allow, -#group_deny, #contact_deny, -#profile-jot-acl-wrapper select { width: 100%; } - -#acl-wrapper-end, -#profile-jot-end { clear: both; height: 5px; } - - - - /** * section */ @@ -1130,3 +1112,102 @@ div[id$="wrapper"] br { clear: left; } .cc-license { margin-top: 100px; font-size: 0.7em; } footer { display: block; margin: 50px 20%; clear: both; } +/** acl **/ +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper{ + display:block!important; +} + +#acl-wrapper { + width: 690px; + float:left; +} +#acl-search { + float:right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right:20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 10px 7px 30px; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + color: #999999; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} + +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +#acl-list-content { +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img{ + width:22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; } +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color:#000000; +} +.acl-button-show { background-image: url("../../../images/show_off.png"); } +.acl-button-hide { background-image: url("../../../images/hide_off.png"); } + +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { border-color: #9ade00; } +.acl-list-item.grouphide { border-color: #ff4141; } +/** /acl **/ + + |