Merge branch 'pull'
This commit is contained in:
		
				commit
				
					
						ac3a6d1d1e
					
				
			
		
					 3 changed files with 437 additions and 0 deletions
				
			
		
							
								
								
									
										80
									
								
								view/theme/quattro/jot.tpl
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										80
									
								
								view/theme/quattro/jot.tpl
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,80 @@
 | 
			
		|||
 | 
			
		||||
<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">
 | 
			
		||||
	<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> 
 | 
			
		||||
	<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> 
 | 
			
		||||
 | 
			
		||||
	<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>
 | 
			
		||||
	</div> 
 | 
			
		||||
	<div id="profile-youtube-wrapper" style="display: $visitor;" >
 | 
			
		||||
		<a id="profile-youtube" class="youtube" title="$youtube" onclick="jotGetVideo();return false;">youtube</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>
 | 
			
		||||
	</div> 
 | 
			
		||||
	<div id="profile-audio-wrapper" style="display: $visitor;" >
 | 
			
		||||
		<a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</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>
 | 
			
		||||
	</div> 
 | 
			
		||||
	<div id="profile-nolocation-wrapper" style="display: none;" >
 | 
			
		||||
		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
 | 
			
		||||
	</div> 
 | 
			
		||||
	<div id="profile-title-wrapper" style="display: $visitor;" >
 | 
			
		||||
		<a id="profile-title" class="article" title="$title" onclick="jotTitle();return false;">title</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
 | 
			
		||||
	</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 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>
 | 
			
		||||
| 
						 | 
				
			
			@ -374,4 +374,186 @@ section {
 | 
			
		|||
	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-perms-end {
 | 
			
		||||
	/*clear: left;*/
 | 
			
		||||
	height: 20px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#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: 1px solid;
 | 
			
		||||
    background-color: @BodyColor;
 | 
			
		||||
    font: bold 85%;
 | 
			
		||||
    color: @Grey1;
 | 
			
		||||
    height: 20px;
 | 
			
		||||
    padding: 10px 5px;
 | 
			
		||||
    border-radius: 8px;
 | 
			
		||||
    -moz-border-radius: 8px;
 | 
			
		||||
    -webkit-border-radius: 8px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/** 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 5px 0px 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 { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
 | 
			
		||||
.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 **/
 | 
			
		||||
 | 
			
		||||
/** tab buttons **/
 | 
			
		||||
ul.tabs {
 | 
			
		||||
    list-style-type: none;
 | 
			
		||||
    padding-bottom: 10px;
 | 
			
		||||
 | 
			
		||||
    li {
 | 
			
		||||
        float: left;
 | 
			
		||||
        margin-left: 20px;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -641,3 +641,178 @@ section {
 | 
			
		|||
  border: 1px solid #999999;
 | 
			
		||||
  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-perms-end {
 | 
			
		||||
  /*clear: left;*/
 | 
			
		||||
 | 
			
		||||
  height: 20px;
 | 
			
		||||
}
 | 
			
		||||
#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: 1px solid;
 | 
			
		||||
  background-color: #2d2d2d;
 | 
			
		||||
  font: bold 85%;
 | 
			
		||||
  color: #ffffff;
 | 
			
		||||
  height: 20px;
 | 
			
		||||
  padding: 10px 5px;
 | 
			
		||||
  border-radius: 8px;
 | 
			
		||||
  -moz-border-radius: 8px;
 | 
			
		||||
  -webkit-border-radius: 8px;
 | 
			
		||||
}
 | 
			
		||||
/** 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 5px 0px 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-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 {
 | 
			
		||||
  height: 12px;
 | 
			
		||||
  font-size: 10px;
 | 
			
		||||
  margin: 0px;
 | 
			
		||||
  padding: 2px 0px 1px;
 | 
			
		||||
  overflow: hidden;
 | 
			
		||||
}
 | 
			
		||||
.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 **/
 | 
			
		||||
/** tab buttons **/
 | 
			
		||||
ul.tabs {
 | 
			
		||||
  list-style-type: none;
 | 
			
		||||
  padding-bottom: 10px;
 | 
			
		||||
}
 | 
			
		||||
ul.tabs li {
 | 
			
		||||
  float: left;
 | 
			
		||||
  margin-left: 20px;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue