kallithea Changeset - 8a50208651c1

Changeset - 8a50208651c1

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 9 years ago 2016-11-08 23:29:12
madski@unity3d.com

style: use Bootstrap compatible markup for alert

Based on work by Dominik Ruf.

5 files changed with 40 insertions and 4 deletions:

kallithea/controllers/admin/settings.py

kallithea/public/css/style.css

kallithea/templates/admin/repos/repo_creating.html

kallithea/templates/admin/settings/settings_system_update.html

kallithea/templates/password_reset.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -422,25 +422,25 @@ class SettingsController(BaseController) @@
     @HasPermissionAnyDecorator('hg.admin')
     def settings_system_update(self):
         import json
         import urllib2
         from kallithea.lib.verlib import NormalizedVersion
         from kallithea import __version__
         defaults = Setting.get_app_settings()
         defaults.update(self._get_hg_ui_settings())
         _update_url = defaults.get('update_url', '')
         _update_url = "" # FIXME: disabled
-        _err = lambda s: '<div style="color:#ff8888; padding:4px 0px">%s</div>' % (s)
+        _err = lambda s: '<div class="alert alert-danger">%s</div>' % (s)
         try:
             import kallithea
             ver = kallithea.__version__
             log.debug('Checking for upgrade on `%s` server', _update_url)
             opener = urllib2.build_opener()
             opener.addheaders = [('User-agent', 'Kallithea-SCM/%s' % ver)]
             response = opener.open(_update_url)
             response_data = response.read()
             data = json.loads(response_data)
         except urllib2.URLError as e:
             log.error(traceback.format_exc())
             return _err('Failed to contact upgrade server: %r' % e)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -3144,24 +3144,55 @@ input[disabled].btn, @@
     border-color: #f89406 #f89406 #ad6704;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 label.disabled {
     color: #aaa;
+}
 .btn.active {
     font-weight: bold;
+}
 .alert {
     padding: 15px;
     margin: 20px 0;
     border: 1px solid transparent;
     border-radius: 4px;
+}
 .alert-success {
     color: #3c763d;
     background-color: #dff0d8;
     border-color: #d6e9c6;
+}
 .alert-info {
     color: #31708f;
     background-color: #d9edf7;
     border-color: #bce8f1;
+}
 .alert-warning {
     color: #8a6d3b;
     background-color: #fcf8e3;
     border-color: #faebcc;
+}
 .alert-danger {
     color: #a94442;
     background-color: #f2dede;
     border-color: #ebccd1;
+}
 ins, div.options a:hover {
     text-decoration: none;
+}
 img,
 #header #header-inner #quick li a:hover span.normal,
 #content div.panel div.form div.fields div.field div.textarea table td table td a,
 #content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td a,
 #clone_url,
 #clone_url_id
+{
     border: none;

kallithea/templates/admin/repos/repo_creating.html

➞

Show inline comments

@@ @@ -26,25 +26,25 @@ @@
     <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
                 ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
     </div>
     <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
             <div class="progress progress-striped active">
                 <div class="progress-bar progress-bar" role="progressbar"
                     aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
                 </div>
             </div>
     </div>
     <div id="progress_error" style="display: none;">
-        <div style="font-weight: bold; color:#aa1111">
+        <div class="alert alert-danger">
                 ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
         </div>
     </div>
 </div>
 <script>
 (function worker() {
   $.ajax({
     url: '${h.url('repo_check_home', repo_name=c.repo_name, repo=c.repo, task_id=c.task_id)}',
     success: function(data) {
       if(data.result === true){
           //redirect to created fork if our ajax loop tells us to do so.

kallithea/templates/admin/settings/settings_system_update.html

➞

Show inline comments

@@ @@ -8,20 +8,22 @@ @@
     A <b>new version</b> is available:
     %if c.latest_data.get('title'):
         <b>${h.literal(c.latest_data['title'])}</b>
     %else:
         <b>${c.latest_ver}</b>
     %endif
 %else:
     You already have the <b>latest</b> stable version.
 %endif
 </p>
 % if c.should_upgrade and c.important_notices:
 <div style="color: #5f5f5f; padding: 3px 0px 5px 0px;">Important notes for this release:</div>
 <div class="alert alert-warning">
     Important notes for this release:
     <ul>
     % for notice in c.important_notices:
         <li>- ${notice}</li>
     % endfor
     </ul>
 </div>
 % endif
 </div>

kallithea/templates/password_reset.html

➞

Show inline comments

@@ @@ -31,27 +31,30 @@ @@
                 <div class="form-group">
                     <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label>
                     <div class="input">
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
                           <div class="activation_msg">${_('A password reset link will be sent to the specified email address if it is registered in the system.')}</div>
                     </div>
                 </div>
                 <div class="alert alert-info">
                     ${_('A password reset link will be sent to the specified email address if it is registered in the system.')}
                 </div>
             </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
         <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
         %endif
         <script type="text/javascript">
          $(document).ready(function(){
             $('#email').focus();
             %if c.captcha_active:
             Recaptcha.create("${c.captcha_public_key}", "recaptcha",
+                {

0 comments (0 inline, 0 general)