summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak2014-05-20 10:32:57 +0200
committerKarel Zak2014-05-20 10:32:57 +0200
commitdeedae5f5c56bc1c6af860c880f8e397d53e5d3f (patch)
treed0b92ef176ffd60b92705f54ec9df2042c11ac5d /disk-utils
parentMerge branch 'cramfs-blocksize' of https://github.com/rudimeier/util-linux (diff)
downloadkernel-qcow2-util-linux-deedae5f5c56bc1c6af860c880f8e397d53e5d3f.tar.gz
kernel-qcow2-util-linux-deedae5f5c56bc1c6af860c880f8e397d53e5d3f.tar.xz
kernel-qcow2-util-linux-deedae5f5c56bc1c6af860c880f8e397d53e5d3f.zip
fsck.cramfs: cleanup usage() and warning messages
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fsck.cramfs.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 56dc3c909..d4967dccb 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -110,8 +110,8 @@ static void __attribute__((__noreturn__)) usage(int status)
fputs(_(" -a for compatibility only, ignored\n"), stream);
fputs(_(" -v, --verbose be more verbose\n"), stream);
fputs(_(" -y for compatibility only, ignored\n"), stream);
- fputs(_(" -b, --blocksize SIZE use this blocksize, defaults to page size\n"), stream);
- fputs(_(" --extract [DIR] test uncompression, optionally extract into DIR\n"), stream);
+ fputs(_(" -b, --blocksize <size> use this blocksize, defaults to page size\n"), stream);
+ fputs(_(" --extract[=<dir>] test uncompression, optionally extract into <dir>\n"), stream);
fputs(USAGE_SEPARATOR, stream);
fputs(USAGE_HELP, stream);
fputs(USAGE_VERSION, stream);
@@ -195,10 +195,9 @@ static void test_super(int *start, size_t * length)
if (*length < super.size)
errx(FSCK_EX_UNCORRECTED, _("file length too short"));
else if (*length > super.size)
- fprintf(stderr,
- _("warning: file extends past end of filesystem\n"));
+ warnx(_("file extends past end of filesystem"));
} else
- fprintf(stderr, _("warning: old cramfs format\n"));
+ warnx(_("old cramfs format"));
}
static void test_crc(int start)
@@ -207,8 +206,7 @@ static void test_crc(int start)
uint32_t crc;
if (!(super.flags & CRAMFS_FLAG_FSID_VERSION_2)) {
- fprintf(stderr,
- _("warning: unable to test CRC: old cramfs format"));
+ warnx(_("unable to test CRC: old cramfs format"));
return;
}
ss='ctx'> {
+ "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
"lang_confirm": "Wollen Sie die Einstellungen unter \/srv\/openslx\/www\/boot\/config speichern?",
"lang_create": "Anlegen",
+ "lang_discardChanges": "Änderungen verwerfen",
"lang_explanationText": "Hier k\u00f6nnen Sie bestimmen, welche Partitionen auf dem Client angelegt werden.",
"lang_helpId": "Partitions-ID",
"lang_helpMountPoint": "Muss ein Absolutes Verzeichnis im Zieldateisystem sein, z.B. \/mnt\/shares\/data",
diff --git a/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json
index 819d2273..04ce6c80 100644
--- a/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json
+++ b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json
@@ -1,6 +1,8 @@
{
+ "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
"lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?",
"lang_create": "Create",
+ "lang_discardChanges": "Discard Changes",
"lang_explanationText": "Here you can configure what kind of partitions will be created on the client computers, and where they will be mounted",
"lang_helpId": "Partition Id",
"lang_helpMountPoint": "Must be a directory: \/example\/directory\/",
diff --git a/modules-available/baseconfig_partitions_cdn/templates/_page.html b/modules-available/baseconfig_partitions_cdn/templates/_page.html
index f7331186..71cbb7db 100644
--- a/modules-available/baseconfig_partitions_cdn/templates/_page.html
+++ b/modules-available/baseconfig_partitions_cdn/templates/_page.html
@@ -23,7 +23,6 @@
<div class='col-sm-1 col-md-2'>
<a class='btn btn-danger' href='?do=BaseConfig_Partitions_CDN&amp;deletePartition={{id}}&amp;token={{token}}'>
<span class='glyphicon glyphicon-trash'></span>
- <span class="hidden-sm">{{lang_delete}}</span>
</a>
</div>
</div>
@@ -31,24 +30,52 @@
{{/partitions}}
<div class='list-group-item clearfix'>
<div class="pull-right">
- <a class='btn btn-default ' data-toggle='modal' data-target='#add-partition'>
+ <a class='btn btn-success ' data-toggle='modal' data-target='#add-partition'>
<span class='glyphicon glyphicon-plus'></span> {{lang_newPartition}}
</a>
</div>
</div>
</div>
- <button class="btn btn-lg btn-primary" type="submit">{{lang_save}}</button>
- <button class="btn btn-lg btn-primary" type="reset">{{lang_reset}}</button>
- <a class="btn btn-lg btn-primary" href="#" onclick="saveConfig()">Download</a>
+ <div class="pull-right">
+ <a class="btn btn-default" data-toggle="modal" data-target="#downloadModal"><span class="glyphicon glyphicon-download-alt"></span> Download</a>
+ <button class="btn btn-warning" type="reset"><span class="glyphicon glyphicon-refresh"></span> {{lang_discardChanges}}</button>
+ <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+ </div>
+
+ <div class ="modal fade" id="downloadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+ <div class="modal-dialog" style="width: 400px" role="document">
+ <div class="modal-content">
+ <div class="modal-body">
+ {{lang_confirm}}
+ </div>
+ <div class="modal-footer">
+ <button type="button" onclick="saveConfig(false)" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+ <button type="button" onclick="saveConfig(true)" class="btn btn-sm btn-danger" name="download"> Download</button>
+ </div>
+ </div>
+ </div>
+ </div>
</form>
-<div>
- <form method="post" action="?do=BaseConfig_Partitions_CDN">
- <input type="hidden" name="token" value="{{token}}">
- <input type="hidden" name="action" value="reset">
- <button class="btn btn-default" type="submit" onclick="return confirm('{{lang_resetConfirm}}');">{{lang_resetDefault}}</button>
- </form>
-</div>
+<form method="post" action="?do=BaseConfig_Partitions_CDN">
+ <input type="hidden" name="token" value="{{token}}">
+ <input type="hidden" name="action" value="reset">
+ <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#resetDefaultModal">{{lang_resetDefault}}</button>
+
+ <div class ="modal fade" id="resetDefaultModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+ <div class="modal-dialog" style="width: 400px" role="document">
+ <div class="modal-content">
+ <div class="modal-body">
+ {{lang_areYouSureNoUndo}}
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+ <button type="submit" class="btn btn-sm btn-danger" name="resetDefault"> {{lang_resetDefault}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
<!-- Create Partition Window -->
<form action="?do=BaseConfig_Partitions_CDN" method="post">
@@ -56,32 +83,37 @@
<div class="modal-dialog">
<div class="modal-content">
- <div class="modal-header">{{lang_newPartition}}</div>
- <div class="modal-body">
+ <div class="modal-header">
+ <h4><b>{{lang_newPartition}}</b></h4>
+ </div>
+ <div class="modal-body">
<div class="input-group">
- <span class="input-group-addon">{{lang_partitionId}}</span>
+ <span class="input-group-addon" style="min-width:140px;">{{lang_partitionId}}</span>
<input name="new-partition-id" class="form-control" type="text">
</div>
<p class="help-block">{{lang_helpId}}</p>
<div class="input-group">
- <span class="input-group-addon">{{lang_partitionSize}}</span>
+ <span class="input-group-addon" style="min-width:140px;">{{lang_partitionSize}}</span>
<input name="new-partition-size" class="form-control" type="text">
</div>
<p class="help-block">{{lang_helpSize}}</p>
<div class="input-group">
- <span class="input-group-addon">{{lang_partitionMountPoint}}</span>
+ <span class="input-group-addon" style="min-width:140px;">{{lang_partitionMountPoint}}</span>
<input name="new-partition-mount-point" class="form-control" type="text">
</div>
<p class="help-block">{{lang_helpMountPoint}}</p>
<div class="input-group">
- <span class="input-group-addon">{{lang_partitionOptions}}</span>
+ <span class="input-group-addon" style="min-width:140px;">{{lang_partitionOptions}}</span>
<input name="new-partition-options" class="form-control" type="text">
</div>
<p class="help-block">{{lang_helpOptions}}</p>
+ </div>
+
+ <div class="modal-footer">
+ <a class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</a>
<input type="submit" class="btn btn-primary" value="{{lang_create}}">
</div>
- <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>
</div>
</div>
</div>
@@ -89,8 +121,8 @@
<input type="hidden" name="token" value="{{token}}">
</form>
<script type="text/javascript">
- function saveConfig(){
- if(confirm('{{lang_confirm}}'))
+ function saveConfig(download){
+ if(download)
window.location = 'api.php?do=baseconfig&user={{user}}&save=true';
else
window.location = 'api.php?do=baseconfig&user={{user}}';