diff options
| -rw-r--r-- | include/conversation.php | 7 | ||||
| -rw-r--r-- | view/jot.tpl | 14 | ||||
| -rw-r--r-- | view/theme/duepuntozero/jot.tpl | 2 | ||||
| -rw-r--r-- | view/theme/loozah/jot.tpl | 77 | ||||
| -rw-r--r-- | view/theme/quattro/colors.less | 2 | ||||
| -rw-r--r-- | view/theme/quattro/quattro.less | 2 |
6 files changed, 95 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php index 9cc5c258b..f4dd01dde 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -856,12 +856,19 @@ function status_editor($a,$x, $notes_cid = 0) { '$action' => 'item', '$share' => (($x['button']) ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), + '$shortupload' => t('upload photo'), '$attach' => t('Attach file'), + '$shortattach' => t('attach file'), '$weblink' => t('Insert web link'), + '$shortweblink' => t('web link'), '$video' => t('Insert video link'), + '$shortvideo' => t('video link'), '$audio' => t('Insert audio link'), + '$shortaudio' => t('audio link'), '$setloc' => t('Set your location'), + '$shortsetloc' => t('set location'), '$noloc' => t('Clear browser location'), + '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), '$wait' => t('Please wait'), diff --git a/view/jot.tpl b/view/jot.tpl index 07add78ba..e20d17b22 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -16,13 +16,13 @@ <ul id="jot-tools" class="jothidden" style="display:none"> - <li><a href="#" onclick="return false;" id="wall-image-upload">$upload</a></li> - <li><a href="#" onclick="return false;" id="wall-file-upload" >$attach</a></li> - <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">$weblink</a></li> - <li><a id="profile-video" onclick="jotVideoURL();return false;">$video</a></li> - <li><a id="profile-audio" onclick="jotAudioURL();return false;">$audio</a></li> - <li><a id="profile-location" onclick="jotGetLocation();return false;">$setloc</a></li> - <li><a id="profile-nolocation" onclick="jotClearLocation();return false;">$noloc</a></li> + <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li> + <li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li> + <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li> + <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li> + <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li> + <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li> + <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li> $jotplugins <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li> diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl index 71b92986d..78cbecea8 100644 --- a/view/theme/duepuntozero/jot.tpl +++ b/view/theme/duepuntozero/jot.tpl @@ -20,7 +20,7 @@ {{ if $content }}<script>initEditor();</script>{{ endif }} -<div id="profile-jot-submit-wrapper" style="display:none"> +<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden"> <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> <div id="profile-upload-wrapper" style="display: $visitor;" > <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div> diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl new file mode 100644 index 000000000..78cbecea8 --- /dev/null +++ b/view/theme/loozah/jot.tpl @@ -0,0 +1,77 @@ + +<div id="profile-jot-wrapper" > + <div id="profile-jot-banner-wrapper"> + <div id="profile-jot-desc" > </div> + <div id="character-counter" class="grey"></div> + </div> + <div id="profile-jot-banner-end"></div> + + <form id="profile-jot-form" action="$action" method="post" > + <input type="hidden" name="type" value="$ptyp" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="location" id="jot-location" value="$defloc" /> + <input type="hidden" name="coord" id="jot-coord" value="" /> + <input type="hidden" name="title" id="jot-title" value="" /> + <input type="hidden" name="post_id" value="$post_id" /> + + <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> + + {{ if $content }}<script>initEditor();</script>{{ endif }} + +<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden"> +<input type="submit" id="profile-jot-submit" name="submit" value="$share" /> + <div id="profile-upload-wrapper" style="display: $visitor;" > + <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div> + </div> + <div id="profile-attach-wrapper" style="display: $visitor;" > + <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div> + </div> + + <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > + <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a> + </div> + <div id="profile-video-wrapper" style="display: $visitor;" > + <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a> + </div> + <div id="profile-audio-wrapper" style="display: $visitor;" > + <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a> + </div> + <div id="profile-location-wrapper" style="display: $visitor;" > + <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a> + </div> + <div id="profile-nolocation-wrapper" style="display: none;" > + <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a> + </div> + <div id="profile-title-wrapper" style="display: $visitor;" > + <a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a> + </div> + + <div id="profile-jot-plugin-wrapper"> + $jotplugins + </div> + + <div id="profile-rotator-wrapper" style="display: $visitor;" > + <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + </div> + <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > + <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang + </div> + <div id="profile-jot-perms-end"></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> + +<div id="profile-jot-end"></div> +</form> +</div> diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 24cce5952..5314b5284 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -90,3 +90,5 @@ @JotSubmitOverText: @Grey4; @JotPermissionUnlockBackgroundColor: @Grey2; @JotPermissionLockBackgroundColor: @Grey4; +@JotLoadingBackgroundColor: @Grey1; + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index d05acf76a..3c16777ea 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -537,7 +537,7 @@ section { } li.loading { float: right; - background-color: @Grey1; + background-color: @JotLoadingBackgroundColor; width: 20px; vertical-align: center; text-align: center; |