diff options
| -rw-r--r-- | include/apps.php | 19 | ||||
| -rw-r--r-- | include/widgets.php | 8 | ||||
| -rw-r--r-- | mod/appman.php | 8 | ||||
| -rw-r--r-- | mod/apps.php | 2 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/app_select.tpl | 3 |
6 files changed, 34 insertions, 12 deletions
diff --git a/include/apps.php b/include/apps.php index b5aad2456..e632ae3d6 100644 --- a/include/apps.php +++ b/include/apps.php @@ -104,7 +104,15 @@ function parse_app_description($f) { function translate_system_apps(&$arr) { - $apps = array( 'Matrix' => t('Matrix'), + $apps = array( + 'Bookmarks' => t('Bookmarks'), + 'Address Book' => t('Address Book'), + 'Login' => t('Login'), + 'Channel Select' => t('Channel Select'), + 'Matrix' => t('Matrix'), + 'Settings' => t('Settings'), + 'Files' => t('Files'), + 'Webpages' => t('Webpages'), 'Channel Home' => t('Channel Home'), 'Profile' => t('Profile'), 'Photos' => t('Photos'), @@ -142,6 +150,9 @@ function app_render($papp,$mode = 'view') { foreach($papp as $k => $v) { if(strpos($v,'http') === 0 && $k != 'papp') $papp[$k] = zid($v); + if($k === 'desc') + $papp['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$papp['desc']); + } if(local_user()) { @@ -152,7 +163,9 @@ function app_render($papp,$mode = 'view') { return replace_macros(get_markup_template('app.tpl'),array( '$app' => $papp, + '$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''), '$install' => ((local_user() && $mode == 'view') ? $install_action : ''), + '$edit' => ((local_user() && $installed && $mode == 'edit') ? t('Edit') : ''), '$delete' => ((local_user() && $installed && $mode == 'edit') ? t('Delete') : '') )); } @@ -348,8 +361,8 @@ function app_encode($app,$embed = false) { if($app['app_page']) $ret['page'] = $app['app_page']; - if($app['alt_url']) - $ret['alt_url'] = $app['alt_url']; +// if($app['alt_url']) +// $ret['alt_url'] = $app['alt_url']; if(! $embed) return $ret; diff --git a/include/widgets.php b/include/widgets.php index 8cd2287a7..1043acce0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -76,11 +76,11 @@ function widget_collections($args) { function widget_appselect($arr) { return replace_macros(get_markup_template('app_select.tpl'),array( - '$title' => t('App Category'), + '$title' => t('Apps'), '$system' => t('System'), - '$personal' => t('Personal') -// '$featured' => t('Featured'), -// '$new' => t('New') + '$personal' => t('Personal'), + '$new' => t('Create Personal App'), + '$edit' => t('Edit Personal App') )); } diff --git a/mod/appman.php b/mod/appman.php index 6d5127b51..15f27676c 100644 --- a/mod/appman.php +++ b/mod/appman.php @@ -44,6 +44,10 @@ function appman_post(&$a) { app_destroy(local_user(),$papp); } + if($_POST['edit']) { + return; + } + if($_SESSION['return_url']) goaway(z_root() . '/' . $_SESSION['return_url']); goaway(z_root() . '/apps/personal'); @@ -58,7 +62,7 @@ function appman_content(&$a) { notice( t('Permission denied.') . EOL); return; } - +logger('content'); $channel = $a->get_channel(); $app = null; $embed = null; @@ -75,7 +79,7 @@ function appman_content(&$a) { return replace_macros(get_markup_template('app_create.tpl'), array( - '$banner' => t('Create App'), + '$banner' => (($app) ? t('Edit App') : t('Create App')), '$app' => $app, '$guid' => (($app) ? $app['app_id'] : ''), '$author' => (($app) ? $app['app_author'] : $channel['channel_hash']), diff --git a/mod/apps.php b/mod/apps.php index 34bbc7142..e88c54c66 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -28,8 +28,6 @@ function apps_content(&$a) { $list = app_list(local_user()); if($list) { foreach($list as $app) { - if($mode == 'edit') - $app['alt_url'] = z_root() . '/appman/?f=&appid=' . $app['app_id']; $apps[] = app_render(app_encode($app),$mode); } } diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index e375bd013..967ccc67c 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,11 +1,15 @@ <div class="app-container"> -<a href="{{if $app.alt_url}}{{$app.alt_url}}{{else}}{{$app.url}}{{/if}}" {{if $app.hover}}title="{{$app.hover}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> +<a href="{{if $app.alt_url}}{{$app.alt_url}}{{else}}{{$app.url}}{{/if}}" {{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> <div class="app-name">{{$app.name}}</div> </a> +{{if $purchase}} +<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> +{{/if}} {{if $install || $update || $delete }} <form action="appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}} +{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}} {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}} </form> {{/if}} diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index d6eb2c31a..4cd945388 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -3,6 +3,9 @@ <ul> <li><a href="apps">{{$system}}</a></li> <li><a href="apps/personal">{{$personal}}</a></li> +<br /> +<li><a href="appman">{{$new}}</a></li> +<li><a href="apps/personal/edit">{{$edit}}</a></li> </ul> </div> |