Skip to content

Commit

Permalink
theme fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@voitto
voitto committed Apr 5, 2009
1 parent 0a0b533 commit 23fe422
Show file tree
Hide file tree
Showing 20 changed files with 219 additions and 110 deletions.
8 changes: 4 additions & 4 deletions app/auction/views/auction_photos/_entry.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<td>
<?php if (extension_for($Entry->content_type) == 'mp3') : ?>

<script src="<?php base_url(); ?>script/swfobject.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>script/swfobject.js" type="text/javascript"></script>

<script src="<?php base_url(); ?>script/ep_player.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>script/ep_player.js" type="text/javascript"></script>

<script type="text/javascript">

// <![CDATA[

var so = new SWFObject("<?php base_url(); ?>resource/ep_player.swf", "ep_player", "269", "226", "9", "#FFFFFF");
var so = new SWFObject("<?php base_path(); ?>resource/ep_player.swf", "ep_player", "269", "226", "9", "#FFFFFF");

so.addVariable("skin", "<?php base_url(); ?>resource/micro_player/skin.xml");
so.addVariable("skin", "<?php base_path(); ?>resource/micro_player/skin.xml");

so.addVariable("file", "<location><?php url_for( array( 'action'=>'attachment.mp3', 'resource'=>$request->resource, 'id'=>$Member->id )); ?></location><creator><?php print $Member->body; ?></creator><title><?php print $Member->title; ?></title>");

Expand Down
8 changes: 4 additions & 4 deletions app/identica/views/dents/_edit.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


<script src="resource/jquery.ajaxfileupload.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.highlightFade.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.jeditable.ajaxupload.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jquery.ajaxfileupload.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.highlightFade.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.jeditable.ajaxupload.js" type="text/javascript"></script>

<script type="text/javascript">
// <![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion app/omb/controllers/groups.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function _edit( &$vars ) {
$avatars = array();
foreach ( $arr as $member_ident ) {
$subscribers .= htmlentities($member_ident->email_value)."\n";
$avatars[$member_ident->id] = $member_ident->avatar;
$avatars[$member_ident->person_id] = $member_ident->avatar;
}

// custom controller adds $group_perms named variable
Expand Down
3 changes: 3 additions & 0 deletions app/omb/models/Method.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ function Method() {
$this->int_field( 'entry_id' );
$this->int_field( 'oauth' );
$this->int_field( 'http' );
$this->int_field( 'omb' );

$this->bool_field( 'enabled' );

$this->char_field( 'function' );
$this->char_field( 'route' );
Expand Down
4 changes: 4 additions & 0 deletions app/omb/plugins/security.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,10 @@ function authenticate_with_oauth() {
//
}

function authenticate_with_omb() {
//
}

function authenticate_with_http() {
global $db,$request;
global $person_id;
Expand Down
20 changes: 10 additions & 10 deletions app/omb/plugins/wp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,22 +865,22 @@ function wp_head() {

//trigger_before( 'admin_head', $current_user, $current_user );

echo '<link rel="shortcut icon" href="resource/favicon.ico" >';
echo '<script type="text/javascript" src="'.$request->base_url.'resource/jquery-1.2.6.min.js"></script>';
echo '<link rel="shortcut icon" href="'.base_path(true).'resource/favicon.ico" >';
echo '<script type="text/javascript" src="'.base_path(true).'resource/jquery-1.2.6.min.js"></script>';

if ($request->resource == "posts" && $request->action == 'new')
echo '
<script type="text/javascript" src="resource/markitup/jquery.markitup.pack.js"></script>
<script type="text/javascript" src="resource/markitup/sets/default/set.js"></script>
<link rel="stylesheet" type="text/css" href="resource/markitup/skins/markitup/style.css" />
<link rel="stylesheet" type="text/css" href="resource/markitup/sets/default/style.css" />
<script type="text/javascript" src="'.base_path(true).'resource/markitup/jquery.markitup.pack.js"></script>
<script type="text/javascript" src="'.base_path(true).'resource/markitup/sets/default/set.js"></script>
<link rel="stylesheet" type="text/css" href="'.base_path(true).'resource/markitup/skins/markitup/style.css" />
<link rel="stylesheet" type="text/css" href="'.base_path(true).'resource/markitup/sets/default/style.css" />
';

echo '
<script type="text/javascript" src=" '.$request->base_url.'resource/jquery.corner.js"></script>
<script type="text/javascript" src=" '.$request->base_url.'resource/jquery.flash.js"></script>
<script type="text/javascript" src=" '.$request->base_url.'resource/jquery.jqUploader.js"></script>
<script type="text/javascript" src="'.base_path(true).'resource/jquery.corner.js"></script>
<script type="text/javascript" src="'.base_path(true).'resource/jquery.flash.js"></script>
<script type="text/javascript" src="'.base_path(true).'resource/jquery.jqUploader.js"></script>
<script type="text/javascript">
$(document).ready(function(){
Expand Down Expand Up @@ -1723,7 +1723,7 @@ function comments_popup_link( $var1, $var2, $var3 ) {
$etag = 1;

echo '
<script src="resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script src="'.base_path(true).'resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script type="text/javascript">
// <![CDATA[
Expand Down
20 changes: 11 additions & 9 deletions app/omb/views/admin/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<!doctype html>
<html lang="en">
<head>
<title>Open Microblogger Admin</title>
<link type="text/css" href="app/omb/views/tabs.css" rel="stylesheet" />
<link rel="stylesheet" href="<?php echo $request->base; ?>app/omb/views/admin/style.css" type="text/css">
<script type="text/javascript" src="resource/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="resource/jquery.ui/ui/ui.core.js"></script>
<script type="text/javascript" src="resource/jquery.ui/ui/ui.tabs.js"></script>

<title>OpenMicroBlogger Admin</title>
<link type="text/css" href="<?php base_path(); ?>app/omb/views/tabs.css" rel="stylesheet" />
<link rel="stylesheet" href="<?php base_path(); ?>app/omb/views/admin/style.css" type="text/css">
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery.ui/ui/ui.core.js"></script>
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery.ui/ui/ui.tabs.js"></script>
<?php
//print_r($request); exit;
?>
<script type="text/javascript">
$(function() {
$("#tabs").tabs();
Expand Down Expand Up @@ -40,12 +42,12 @@
'resource'=>'admin',
'action'=>'theme/partial'
)); ?>">Themes</a></li>

<?php if (empty($request->prefix)) : ?>
<li><a href="<?php url_for(array(
'resource'=>'blogs',
'action'=>'index/partial'
)); ?>">Microblogs</a></li>

<?php endif; ?>
<li><a href="JavaScript:top.location.href('<?php base_url(); ?>');">Return To Site</a></li>
</ul>

Expand Down
97 changes: 81 additions & 16 deletions app/omb/views/groups/_edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
show_tabs_page('<?php url_for( array( 'resource'=>'groups', 'action'=>'edit/partial', 'id'=>$Member->id )); ?>');
});
});
<?php endforeach; ?>
<?php endforeach; ?>
Expand All @@ -52,6 +53,30 @@
});
<?php foreach($avatars as $key=>$ava) : ?>
<?php $pname = $key."avatar"; ?>
$("#<?php echo $pname; ?>").click(function(e){
$("#<?php echo $pname; ?>").html("<img src='resource/jeditable/indicator.gif'>");
var someurl = "<?php url_for(array(
'resource'=>'memberships'
)); ?>";
var submitdata = {};
submitdata['entry[etag]'] = <?php echo ''; ?>;
submitdata['method'] = 'delete';
$.post(someurl, submitdata, function(str) {
show_tabs_page('<?php url_for( array( 'resource'=>'groups', 'action'=>'edit/partial', 'id'=>$Member->id )); ?>');
});
});

<?php endforeach; ?>



});
</script>

Expand All @@ -77,7 +102,7 @@
<td colspan="2">

<?php foreach($avatars as $key=>$ava) : ?>
<img width="50" height="50" src="<?php echo $ava ?>" alt="image" />
<img id="<?php echo $key."avatar"; ?>" width="50" height="50" src="<?php echo $ava ?>" alt="image" />
<?php endforeach; ?>
<br /><br />
</td>
Expand Down Expand Up @@ -121,9 +146,9 @@ <h3>Permissions:</h3>
$can[] = $p;

if (in_array($table,array('groups','posts','reviews','blogs')))
echo "<tr><td>[<a href=\"".$request->url_for(array('resource'=>$table))."\">".$table."</a>]</td><td>";
echo "<tr><td>[<a href=\"".$request->url_for(array('resource'=>$table))."\">".$table."</a>]<div id=\"".$table."_fields"."\"></div></td><td>";
else
echo "<tr><td><b>".$table."</b></td><td>";
echo "<tr><td><b>".$table."</b><div id=\"".$table."_fields"."\"></div></td><td>";

$comma = "";

Expand Down Expand Up @@ -199,14 +224,52 @@ <h3>Permissions:</h3>
<?php if (!in_array($Member->name, array('members','everyone'))) : ?>
<p>Add a person to the <?php echo $Member->name; ?> group: </p>
<?php $Identity->find(); ?>
<script type="text/javascript">
$(document).ready(function(){


<?php while ($i = $Identity->MoveNext()) : ?>
<?php if (!array_key_exists($i->id,$avatars)) : ?>
<?php if (!array_key_exists($i->person_id,$avatars)) : ?>




<?php $pname = $i->person_id."avatar"; ?>


$("#<?php echo $pname; ?>").click(function(e){
$("#<?php echo $pname; ?>").html("<img src='resource/jeditable/indicator.gif'>");
var someurl = "<?php url_for(array(
'resource'=>'memberships'
)); ?>";
var submitdata = {};
submitdata['membership[group_id]'] = <?php echo $Member->id; ?>;
submitdata['membership[person_id]'] = <?php echo $i->person_id; ?>;
submitdata['method'] = 'post';
$.post(someurl, submitdata, function(str) {
show_tabs_page('<?php url_for( array( 'resource'=>'groups', 'action'=>'edit/partial', 'id'=>$Member->id )); ?>');
});
});



<img width="50" height="50" src="<?php echo $i->avatar; ?>" alt="image" />

<?php endif; ?>
<?php endwhile; ?>

});
</script>

<?php $Identity->find(); ?>

<?php while ($i = $Identity->MoveNext()) : ?>
<?php if (!array_key_exists($i->person_id,$avatars)) : ?>
<img id="<?php echo $i->person_id."avatar"; ?>" width="50" height="50" src="<?php echo $i->avatar; ?>" alt="image" />
<?php endif; ?>
<?php endwhile; ?>



<?php endif; ?>

</td></tr>
Expand Down Expand Up @@ -252,13 +315,13 @@ <h3>Permissions:</h3>
<br />
<br />
<ul>
<li>http://example.com/widgets</li>
<li>http://example.com/widgets.html</li>
<li>http://example.com/widgets.json</li>
<li>http://example.com/widgets/1</li>
<li>http://example.com/widgets/1/entry</li>
<li>http://example.com/widgets/1/entry.json</li>
<li>http://example.com/widgets/1/entry.jpg</li>
<li><?php url_for(array('resource'=>'events')); ?></li>
<li><?php url_for(array('resource'=>'events.html')); ?></li>
<li><?php url_for(array('resource'=>'events.json')); ?></li>
<li><?php url_for(array('resource'=>'events/1')); ?></li>
<li><?php url_for(array('resource'=>'events/1/entry')); ?></li>
<li><?php url_for(array('resource'=>'events/1/entry.json')); ?></li>
<li><?php url_for(array('resource'=>'events/1/entry.jpg')); ?></li>
</ul>
<br /><br />
</td>
Expand All @@ -271,9 +334,10 @@ <h3>Permissions:</h3>
<br />
<br />
<ul>
<li>form action: http://example.com/widgets</li>
<li>url: <?php url_for(array('resource'=>'events')); ?><br /></li>
<li>form <b>method</b> parameter:</u> &quot;post&quot;</li>
<li>form <b>widget[name]</b> parameter: &quot;Cool Widget&quot;</li>
<li>form <b>auth</b> parameter:</u> &quot;http&quot;</li>
<li>form <b>event[name]</b> parameter: &quot;Cool event&quot;</li>
</ul>
<br /><br />
</td>
Expand All @@ -286,10 +350,11 @@ <h3>Permissions:</h3>
<br />
<br />
<ul>
<li>form action: http://example.com/widgets</li>
<li>url: <?php url_for(array('resource'=>'events')); ?><br /></li>
<li>form <b>method</b> parameter:</u> &quot;put&quot;</li>
<li>form <b>auth</b> parameter:</u> &quot;http&quot;</li>
<li>form <b>entry[etag]</b> parameter: &quot;et-3425934&quot; </li>
<li>form <b>widget[name]</b> parameter: &quot;Radio Widget&quot;</li>
<li>form <b>event[name]</b> parameter: &quot;Radio event&quot;</li>
</ul>
<br /><br />
</td>
Expand Down
8 changes: 4 additions & 4 deletions app/omb/views/groups/_index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<?php if (!(is_ajax())) : ?>


<link type="text/css" href="app/omb/views/tabs.css" rel="stylesheet" />
<script type="text/javascript" src="resource/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="resource/jquery.ui/ui/ui.core.js"></script>
<script type="text/javascript" src="resource/jquery.ui/ui/ui.tabs.js"></script>
<link type="text/css" href="<?php base_path(); ?>app/omb/views/tabs.css" rel="stylesheet" />
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery.ui/ui/ui.core.js"></script>
<script type="text/javascript" src="<?php base_path(); ?>resource/jquery.ui/ui/ui.tabs.js"></script>

<script type="text/javascript">
//<![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion app/omb/views/groups/_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<td valign="top" align="left"><input size="50" maxlength="255" id="group_name" name="group[name]" type="text" value="" /></td>
</tr>
<tr>
<td align="right" valign="top"><p>Subscribers</p></td>
<td align="right" valign="top"><p>Subscribers<br />(1 e-mail per line)</p></td>
<td valign="top" align="left"><textarea cols="48" rows="10" name="subscribers"></textarea></td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions app/omb/views/identities/_admin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

<?php if (!in_array('partial',$request->activeroute->patterns)) : ?>

<script src="resource/hoverIntent.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/hoverIntent.js" type="text/javascript"></script>

<script src="resource/superfish.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/superfish.js" type="text/javascript"></script>

<script type="text/javascript">

Expand Down
8 changes: 4 additions & 4 deletions app/omb/views/identities/_apps.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


<script src="resource/jquery.ajaxfileupload.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.highlightFade.js" type="text/javascript"></script>
<script src="resource/jeditable/jquery.jeditable.ajaxupload.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jquery.ajaxfileupload.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.jeditable.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.highlightFade.js" type="text/javascript"></script>
<script src="<?php base_path(); ?>resource/jeditable/jquery.jeditable.ajaxupload.js" type="text/javascript"></script>

<script type="text/javascript">
// <![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion app/omb/views/identities/_subs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3><?php echo $si->nickname; ?>
&nbsp;(<?php echo $si->fullname; ?>)
<?php endif; ?></h3>

<p><a style="hover:none;" href="<?php echo $request->url_for(array('resource'=>$si->nickname)); ?>"><img style="border:none;width:48px;height:48px;" src="<?php echo $si->avatar; ?>"></a>&nbsp;&nbsp;&nbsp;&nbsp;<?php if (!empty($zeep)) : ?>SMS&nbsp;<input name="do_sms<?php echo $subscriber->id; ?>" id="do_sms<?php echo $subscriber->id; ?>" type="checkbox" <?php if ($subscriber->sms) echo "checked"; ?>><?php endif; ?>&nbsp;&nbsp;&nbsp;&nbsp;E-mail&nbsp;<input name="do_email<?php echo $subscriber->id; ?>" id="do_email<?php echo $subscriber->id; ?>" type="checkbox" <?php if ($subscriber->email) echo "checked"; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<a style="hover:none;" href="<?php echo $request->url_for(array('resource'=>'subscriptions','id'=>$subscriber->id,'action'=>'remove')); ?>"><img style="border:none;width:16px;height:16px;" src="resource/block.gif"></a></p>
<p><a style="hover:none;" href="<?php echo $request->url_for(array('resource'=>$si->nickname)); ?>"><img style="border:none;width:48px;height:48px;" src="<?php echo $si->avatar; ?>"></a>&nbsp;&nbsp;&nbsp;&nbsp;<?php if (!empty($zeep)) : ?>SMS&nbsp;<input name="do_sms<?php echo $subscriber->id; ?>" id="do_sms<?php echo $subscriber->id; ?>" type="checkbox" <?php if ($subscriber->sms) echo "checked"; ?>><?php endif; ?>&nbsp;&nbsp;&nbsp;&nbsp;E-mail&nbsp;<input name="do_email<?php echo $subscriber->id; ?>" id="do_email<?php echo $subscriber->id; ?>" type="checkbox" <?php if ($subscriber->email) echo "checked"; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<a style="hover:none;" href="<?php echo $request->url_for(array('resource'=>'subscriptions','id'=>$subscriber->id,'action'=>'remove')); ?>"><img style="border:none;width:16px;height:16px;" src="<?php base_path(); ?>resource/block.gif"></a></p>


<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion app/omb/views/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<a href="/" class="link-white-small">Home</a>
| <a href="" class="link-white-small">Contact</a>
| <a href="terms.html" class="link-white-small">Terms of Use</a>
| <a href="<?php print $atomfeed; ?>"><img alt="feed" src="<?php base_url(); ?>resource/feed.png" style="border:none;"/></a>
| <a href="<?php print $atomfeed; ?>"><img alt="feed" src="<?php base_path(); ?>resource/feed.png" style="border:none;"/></a>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion app/omb/views/index.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<a href="/" class="link-white-small">Home</a>
| <a href="" class="link-white-small">Contact</a>
| <a href="terms.html" class="link-white-small">Terms of Use</a>
| <a href="<?php print $atomfeed; ?>"><img alt="feed" src="<?php base_url(); ?>resource/feed.png" style="border:none;"/></a>
| <a href="<?php print $atomfeed; ?>"><img alt="feed" src="<?php base_path(); ?>resource/feed.png" style="border:none;"/></a>
</td>
</tr>
</table>
Expand Down

0 comments on commit 23fe422

Please sign in to comment.