diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/jot-header.tpl | 18 | ||||
| -rw-r--r-- | view/jot.tpl | 96 | ||||
| -rw-r--r-- | view/settings_oauth.tpl | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/jot.tpl (renamed from view/theme/quattro/jot.tpl) | 26 | ||||
| -rw-r--r-- | view/theme/quattro/colors.less | 12 | ||||
| -rw-r--r-- | view/theme/quattro/quattro.less | 156 | ||||
| -rw-r--r-- | view/theme/quattro/style.css | 131 |
7 files changed, 255 insertions, 188 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index ecfed6c42..4186ef78e 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -81,7 +81,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; $("#profile-jot-text-loading").hide(); - $("#profile-jot-submit-wrapper").show(); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -98,19 +98,21 @@ function initEditor(cb){ } } +function enableOnUser(){ + if (editor) return; + $(this).val(""); + initEditor(); +} + </script> <script type="text/javascript" src="js/ajaxupload.js" ></script> <script> var ispublic = '$ispublic'; $(document).ready(function() { - /* enable tinymce on focus */ - $("#profile-jot-text").focus(function(){ - if (editor) return; - $(this).val(""); - initEditor(); - }); - + /* enable tinymce on focus and click */ + $("#profile-jot-text").focus(enableOnUser); + $("#profile-jot-text").click(enableOnUser); var uploader = new window.AjaxUpload( 'wall-image-upload', diff --git a/view/jot.tpl b/view/jot.tpl index 71b92986d..df82f7199 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -1,77 +1,47 @@ - -<div id="profile-jot-wrapper" > - <div id="profile-jot-banner-wrapper"> +<form action="$action" method="post"> + <div id="jot"> <div id="profile-jot-desc" > </div> + <input name="title" id="jot-title" type="text" placeholder="$titleplaceholder" value="$title" class="jothidden" style="display:none"> <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> - + + <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"> -<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 + + + <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> + $jotplugins + + <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li> + <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li> + </ul> </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> +</form> + +<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/settings_oauth.tpl b/view/settings_oauth.tpl index bc5866bec..0de0dbe98 100644 --- a/view/settings_oauth.tpl +++ b/view/settings_oauth.tpl @@ -23,8 +23,8 @@ $tabs {{ endif }} {{ endif }} {{ if $app.my }} - <a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon edit" title="$edit"> </a> - <a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon drop" title="$delete"> </a> + <a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit"> </a> + <a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon s22 delete" title="$delete"> </a> {{ endif }} </div> {{ endfor }} diff --git a/view/theme/quattro/jot.tpl b/view/theme/duepuntozero/jot.tpl index d65ac8b17..71b92986d 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/duepuntozero/jot.tpl @@ -21,36 +21,32 @@ {{ if $content }}<script>initEditor();</script>{{ endif }} <div id="profile-jot-submit-wrapper" style="display:none"> +<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="camera" title="$upload">image upload</a></div> + <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="attach" title="$attach">attach file</a></div> + <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="link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">enter link</a> + <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="video" title="$video" onclick="jotVideoURL();return false;">video url</a> + <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="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</a> + <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="globe" title="$setloc" onclick="jotGetLocation();return false;">set location</a> + <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="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a> + <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="article" title="$title" onclick="jotTitle();return false;">title</a> + <a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a> </div> - <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > - <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate" title="$permset" >permissions</a>$bang - </div> -<input type="submit" id="profile-jot-submit" name="submit" value="$share" /> - <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> $jotplugins @@ -59,6 +55,10 @@ <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;"> diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index d36ff05b0..24cce5952 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -78,3 +78,15 @@ @CommentBoxFullBorderColor: @Grey5; @TagColor: @Grey1; + +@JotToolsBackgroundColor: @Metalic4; +@JotToolsBorderColor: @Metalic2; +@JotToolsOverBackgroundColor: @Metalic3; +@JotToolsOverBorderColor: @Metalic1; +@JotToolsText: @Grey2; +@JotSubmitBackgroundColor: @Grey2; +@JotSubmitText: @Grey4; +@JotSubmitOverBackgroundColor: @Metalic1; +@JotSubmitOverText: @Grey4; +@JotPermissionUnlockBackgroundColor: @Grey2; +@JotPermissionLockBackgroundColor: @Grey4; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2e61b9182..81943c9b3 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -9,6 +9,7 @@ body { margin: 50px 0px 0px 0px; display:table; } +h4 { font-size: 1.1em } .shadow(@x: 0px, @y: 5px){ -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); @@ -40,6 +41,7 @@ a:hover {color: @LinkHover; text-decoration: underline; } .left { float: left; } .right { float: right; } .hidden { display: none; } +.clear { clear: both; } code { font-family: Courier, monospace; @@ -338,6 +340,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; + width: 780px; } .wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;} .unstarred { display: none; } @@ -457,77 +460,85 @@ section { } } +/* editor */ +#jot { -#profile-jot-wrapper { width: 100%; margin: 0px 2em 20px 0px; -} -.profile-jot-text { - height: 1em; width: 100%; font-size: 10px; - color: @CommentBoxEmptyColor; - border: 1px solid @CommentBoxEmptyBorderColor; - padding:0.3em; -} -#profile-jot-plugin-wrapper, -#profile-jot-submit-wrapper { - margin-top: 10px; -} - - -#profile-jot-submit { - float: left; -} -#profile-upload-wrapper{ - float: left; - margin-left: 10px; -} -#profile-attach-wrapper, -#profile-rotator, -#profile-link-wrapper, -#profile-youtube-wrapper, -#profile-video-wrapper, -#profile-audio-wrapper, -#profile-location-wrapper, -#profile-nolocation-wrapper, -#profile-title-wrapper { - float: left; - margin-left: 20px; -} - -#profile-jot-perms { - float: left; - margin-left: 35px; - margin-right: 35px; -} + .profile-jot-text { + height: 1em; width: 99%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } -#profile-jot-perms-end { - /*clear: left;*/ - height: 20px; -} + #jot-tools { + margin: 0px; padding: 0px; + height: 40px; overflow: none; + width: 800px; + background-color: @JotToolsBackgroundColor; + border-bottom: 2px solid @JotToolsBorderColor; + li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid @JotToolsBorderColor; + a { + display: block; + color: @JotToolsText; + width: 100%; + height:40px; + text-align: center; + line-height: 40px; + overflow: hidden; + } + } + li:hover { + background-color: @JotToolsOverBackgroundColor; + border-bottom: 2px solid @JotToolsOverBorderColor; + } + li.perms { + float: right; + width: 40px; + a.unlock { + width: 30px; + border-left: 10px solid @JotPermissionUnlockBackgroundColor; + background-color: @JotPermissionUnlockBackgroundColor; + } + a.lock { + width: 30px; + border-left: 10px solid @JotPermissionLockBackgroundColor; + background-color: @JotPermissionLockBackgroundColor; + } + + } + li.submit { + float: right; + background-color: @JotSubmitBackgroundColor; + border-bottom: 2px solid @JotSubmitBackgroundColor; + border-right: 1px solid @Grey4; + border-left: 1px solid @Grey4; + input { + border: 0px; margin: 0px; padding: 0px; + background-color: @JotSubmitBackgroundColor; + color: @JotSubmitText; + width: 80px; height: 40px; + line-height: 40px; + } + input:hover { + background-color: @JotSubmitOverBackgroundColor; + color: @JotSubmitOverText; + } + } + } -#profile-jot-plugin-end{ - clear: both; -} -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; } -#profile-jot-networks-end { - clear: both; -} -#profile-jot-end, #about-jot-end { - margin-bottom: 15px; -} -#about-jot-submit-wrapper { - margin-top: 15px; -} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -717,6 +728,31 @@ ul.tabs { &.radio .field_help { margin-left: 0px; } } +#profile-edit-links li { + list-style: none; +} + +/* oauth */ +.oauthapp { + height: auto; overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} + /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 6de9800af..0ba05b8ac 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -168,6 +168,9 @@ body { margin: 50px 0px 0px 0px; display: table; } +h4 { + font-size: 1.1em; +} a, a:link { color: #005c94; text-decoration: none; @@ -189,6 +192,9 @@ a:hover { .hidden { display: none; } +.clear { + clear: both; +} code { font-family: Courier, monospace; white-space: pre; @@ -609,6 +615,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; + width: 780px; } .wall-item-decor { position: absolute; @@ -779,67 +786,82 @@ section { background: url("../../../images/tag.png") no-repeat center right; color: #ffffff; } -#profile-jot-wrapper { +/* editor */ +#jot { width: 100%; margin: 0px 2em 20px 0px; } -.profile-jot-text { +#jot .profile-jot-text { height: 1em; - width: 100%; + width: 99%; font-size: 10px; color: #999999; border: 1px solid #999999; padding: 0.3em; } -#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { - margin-top: 10px; +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 800px; + background-color: #0e232e; + border-bottom: 2px solid #9eabb0; } -#profile-jot-submit { +#jot #jot-tools li { + list-style: none; float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; } -#profile-upload-wrapper { - float: left; - margin-left: 10px; -} -#profile-attach-wrapper, -#profile-rotator, -#profile-link-wrapper, -#profile-youtube-wrapper, -#profile-video-wrapper, -#profile-audio-wrapper, -#profile-location-wrapper, -#profile-nolocation-wrapper, -#profile-title-wrapper { - float: left; - margin-left: 20px; +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; } -#profile-jot-perms { - float: left; - margin-left: 35px; - margin-right: 35px; +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; } -#profile-jot-perms-end { - /*clear: left;*/ - - height: 20px; +#jot #jot-tools li.perms { + float: right; + width: 40px; } -#profile-jot-plugin-end { - clear: both; +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; } -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; } -#profile-jot-networks-end { - clear: both; +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; } -#profile-jot-end, #about-jot-end { - margin-bottom: 15px; +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; } -#about-jot-submit-wrapper { - margin-top: 15px; +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; } /** buttons **/ /*input[type="submit"] { @@ -1025,6 +1047,31 @@ ul.tabs li .active { .field.radio .field_help { margin-left: 0px; } +#profile-edit-links li { + list-style: none; +} +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} /* page footer */ footer { height: 100px; |