diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-10-28 11:16:04 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-10-28 11:16:04 +0000 |
| commit | bcdf3a23db6867332232f8c1b69ba3fa394e191a (patch) | |
| tree | 20be51b4a2e5f1c7f8bc3a50ca3fb9571e972af3 /settings/templates | |
| parent | b07944798848bc5196dc75e8d8caea5ca71b0f15 (diff) | |
| parent | 22dcd3b6a691c7a245e4d1de30f09bb17efdfceb (diff) | |
| download | nextcloud-server-bcdf3a23db6867332232f8c1b69ba3fa394e191a.tar.gz nextcloud-server-bcdf3a23db6867332232f8c1b69ba3fa394e191a.zip | |
Merge master into ocs_api
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/apps.php | 4 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 30f919ac753..1e9598de1e3 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -8,10 +8,11 @@ </script> <div id="controls"> <a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a> + <a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a> </div> <ul id="leftcontent" class="applist"> <?php foreach($_['apps'] as $app):?> - <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" + <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?> data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1"> <a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a> <script type="application/javascript"> @@ -24,6 +25,7 @@ <div id="rightcontent"> <div class="appinfo"> <h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3> + <span class="score"></span> <p class="description"></p> <img src="" class="preview" /> <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 4503f3d50b4..55ff24b4223 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -5,7 +5,7 @@ */?> <div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;"> - <p id="quotatext"><?php echo $l->t('You use');?> <strong><?php echo $_['usage'];?></strong> <?php echo $l->t('of the available');?> <strong><?php echo $_['total_space'];?></strong></p> + <p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s<strong>', array($_['usage'], $_['total_space']));?></p> </div></div> <div class="personalblock"> @@ -16,7 +16,7 @@ <form id="passwordform"> <fieldset class="personalblock"> - <div id="passwordchanged"><?php echo $l->t('Your password got changed');?></div> + <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" /> <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" /> |