Skip to content

Commit

Permalink
Formatting. Style. Nothing important
Browse files Browse the repository at this point in the history
git-svn-id: svn://cherokee-project.com/cherokee/trunk@5883 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information
alobbs committed Dec 7, 2010
1 parent 79975da commit dca49f0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions admin/wizards/drupal.py
Expand Up @@ -284,18 +284,21 @@ def __call__ (self):
cont += CTK.RawHTML ('<h2>%s</h2>' %(_(NOTE_LOCAL_H1)))
cont += submit
cont += CTK.DruidButtonsPanel_PrevNext_Auto()

return cont.Render().toStr()


class Welcome:
def __call__ (self):
cont = CTK.Container()
cont = CTK.Container()
cont += CTK.RawHTML ('<h2>%s</h2>' %(_(NOTE_WELCOME_H1)))
cont += Wizard.Icon ('drupal', {'class': 'wizard-descr'})
box = CTK.Box ({'class': 'wizard-welcome'})

box = CTK.Box ({'class': 'wizard-welcome'})
box += CTK.RawHTML ('<p>%s</p>' %(_(NOTE_WELCOME_P1)))
box += CTK.RawHTML ('<p>%s</p>' %(_(NOTE_WELCOME_P2)))
box += Wizard.CookBookBox ('cookbook_drupal')

cont += box

# Send the VServer num if it's a Rule
Expand All @@ -318,10 +321,12 @@ def __call__ (self):
def is_drupal_dir (path):
path = validations.is_local_dir_exists (path)
module_inc = os.path.join (path, 'includes/module.inc')

try:
validations.is_local_file_exists (module_inc)
except:
raise ValueError, _(ERROR_NO_SRC)

return path


Expand Down
4 changes: 2 additions & 2 deletions admin/wizards/icons.py
Expand Up @@ -129,8 +129,8 @@ def __call__ (self):
tmp = re.findall (r'^/wizard/vserver/(\d+)/', CTK.request.url)
submit = CTK.Submitter (URL_APPLY)
submit += CTK.Hidden('%s!vsrv_num'%(PREFIX), tmp[0])
submit += CTK.Hidden('%s!icons'%(PREFIX), ['0','1'][icons])
submit += CTK.Hidden('%s!themes'%(PREFIX), ['0','1'][themes])
submit += CTK.Hidden('%s!icons'%(PREFIX), ('0','1')[icons])
submit += CTK.Hidden('%s!themes'%(PREFIX), ('0','1')[themes])
submit += CTK.Hidden('final', '1')
cont += submit
cont += CTK.DruidButtonsPanel_Create()
Expand Down

0 comments on commit dca49f0

Please sign in to comment.